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>

7 files changed, 51 insertions, 51 deletions

diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 5acd6f349aee..c6ad07a5c0b0 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -13,13 +13,13 @@ $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
 
 $(eval $(call gb_ExternalProject_use_externals,cairo,\
 	freetype \
-	png \
+	libpng \
 	zlib \
 ))
 
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_ExternalProject_use_unpacked,cairo,fontconfig))
-$(eval $(call gb_ExternalProject_use_unpacked,cairo,png))
+$(eval $(call gb_ExternalProject_use_unpacked,cairo,libpng))
 endif
 
 $(eval $(call gb_ExternalProject_register_targets,cairo,\
diff --git a/external/collada2gltf/StaticLibrary_collada2gltf.mk b/external/collada2gltf/StaticLibrary_collada2gltf.mk
index 2d1048d5cd70..03039976ea9d 100644
--- a/external/collada2gltf/StaticLibrary_collada2gltf.mk
+++ b/external/collada2gltf/StaticLibrary_collada2gltf.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,collada2gltf,collada2gltf))
 
 $(eval $(call gb_StaticLibrary_use_externals,collada2gltf, \
 	opencollada_parser \
-	png \
+	libpng \
 ))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,collada2gltf))
diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
index afb0016fbaf4..f8f834d0ed80 100644
--- a/external/libpng/Module_libpng.mk
+++ b/external/libpng/Module_libpng.mk
@@ -10,8 +10,8 @@
 $(eval $(call gb_Module_Module,libpng))
 
 $(eval $(call gb_Module_add_targets,libpng,\
-	StaticLibrary_png \
-	UnpackedTarball_png \
+	StaticLibrary_libpng \
+	UnpackedTarball_libpng \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
new file mode 100644
index 000000000000..f500720616a2
--- /dev/null
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,libpng))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libpng))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,libpng,libpng))
+
+$(eval $(call gb_StaticLibrary_use_externals,libpng,\
+	zlib \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
+	UnpackedTarball/libpng/png \
+	UnpackedTarball/libpng/pngerror \
+	UnpackedTarball/libpng/pngget \
+	UnpackedTarball/libpng/pngmem \
+	UnpackedTarball/libpng/pngpread \
+	UnpackedTarball/libpng/pngread \
+	UnpackedTarball/libpng/pngrio \
+	UnpackedTarball/libpng/pngrtran \
+	UnpackedTarball/libpng/pngrutil \
+	UnpackedTarball/libpng/pngset \
+	UnpackedTarball/libpng/pngtrans \
+	UnpackedTarball/libpng/pngwio \
+	UnpackedTarball/libpng/pngwrite \
+	UnpackedTarball/libpng/pngwtran \
+	UnpackedTarball/libpng/pngwutil \
+	$(if $(filter ARM,$(CPUNAME)),\
+	    UnpackedTarball/libpng/arm/arm_init \
+	    UnpackedTarball/libpng/arm/filter_neon_intrinsics \
+	) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libpng/StaticLibrary_png.mk b/external/libpng/StaticLibrary_png.mk
deleted file mode 100644
index a735329b0ea9..000000000000
--- a/external/libpng/StaticLibrary_png.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,png))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,png))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,png,png))
-
-$(eval $(call gb_StaticLibrary_use_externals,png,\
-	zlib \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,png,\
-	UnpackedTarball/png/png \
-	UnpackedTarball/png/pngerror \
-	UnpackedTarball/png/pngget \
-	UnpackedTarball/png/pngmem \
-	UnpackedTarball/png/pngpread \
-	UnpackedTarball/png/pngread \
-	UnpackedTarball/png/pngrio \
-	UnpackedTarball/png/pngrtran \
-	UnpackedTarball/png/pngrutil \
-	UnpackedTarball/png/pngset \
-	UnpackedTarball/png/pngtrans \
-	UnpackedTarball/png/pngwio \
-	UnpackedTarball/png/pngwrite \
-	UnpackedTarball/png/pngwtran \
-	UnpackedTarball/png/pngwutil \
-	$(if $(filter ARM,$(CPUNAME)),\
-	    UnpackedTarball/png/arm/arm_init \
-	    UnpackedTarball/png/arm/filter_neon_intrinsics \
-	) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libpng/UnpackedTarball_png.mk b/external/libpng/UnpackedTarball_libpng.mk
index ed8aa59c8493..dca4e4b5cfe9 100644
--- a/external/libpng/UnpackedTarball_png.mk
+++ b/external/libpng/UnpackedTarball_libpng.mk
@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,png))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libpng))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,png,$(PNG_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libpng,$(LIBPNG_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_files,png,.,\
+$(eval $(call gb_UnpackedTarball_add_files,libpng,.,\
 	external/libpng/configs/pnglibconf.h \
 ))
 
diff --git a/external/libzmf/ExternalProject_libzmf.mk b/external/libzmf/ExternalProject_libzmf.mk
index da720fb14157..f2c54c9dbddb 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
 $(eval $(call gb_ExternalProject_use_externals,libzmf,\
 	boost_headers \
 	icu \
-	png \
+	libpng \
 	revenge \
 	zlib \
 ))