summaryrefslogtreecommitdiffstats
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-14 14:12:40 +0200
committerMichael Stahl <mstahl@redhat.com>2017-09-15 11:01:39 +0200
commitb0e0ee45d667df1473b47e441a6911dd2b4eadba (patch)
tree47554ac6c554c4167a9573869b2d37733f9f7836 /RepositoryExternal.mk
parentconsistent naming of externals: libmariadb -> mariadb-connector-c (diff)
downloadcore-b0e0ee45d667df1473b47e441a6911dd2b4eadba.tar.gz
core-b0e0ee45d667df1473b47e441a6911dd2b4eadba.zip
consistent naming of externals: png -> libpng
Change-Id: I82d95e74318600b390d5add716773c658817e504 Reviewed-on: https://gerrit.libreoffice.org/42296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4794fce5541e..22dcc802aeaa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2644,7 +2644,7 @@ endif # ENABLE_DBUS
ifneq ($(SYSTEM_LIBPNG),)
-define gb_LinkTarget__use_png
+define gb_LinkTarget__use_libpng
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(LIBPNG_CFLAGS) \
@@ -2656,25 +2656,25 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
-gb_ExternalProject__use_png :=
+gb_ExternalProject__use_libpng :=
else # !SYSTEM_LIBPNG
-define gb_LinkTarget__use_png
+define gb_LinkTarget__use_libpng
$(call gb_LinkTarget_set_include,$(1),\
$(LIBPNG_CFLAGS) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
- png \
+ libpng \
)
$(call gb_LinkTarget__use_zlib,$(1))
endef
-define gb_ExternalProject__use_png
+define gb_ExternalProject__use_libpng
$(call gb_ExternalProject_use_static_libraries,$(1),\
- png \
+ libpng \
)
endef