fdo#70393: move libpng to a subdir of external

Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Makefile.in

@@ -186,6 +186,9 @@ distclean : clean compilerplugins-clean
 cmd:
 	echo "custom cmd" && ( $(cmd) )
 
+usedcxxfiles:
+	$(GNUMAKE) -f $(SRCDIR)/Makefile.gbuild $(@)
+
 #
 # Fetch
 #

RepositoryModule_host.mk

@@ -98,7 +98,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
-	$(call gb_Helper_optional,LIBPNG,libpng) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \

external/Module_external.mk

@@ -39,4 +39,7 @@ $(eval $(call gb_Module_add_targets,external,\
 endif
 endif
 
+$(call gb_Helper_optional,LIBPNG,\
+    $(eval $(call gb_Module_add_moduledir,external,libpng)))
+
 # vim: set noet sw=4 ts=4:

libpng/UnpackedTarball_png.mk → external/libpng/UnpackedTarball_png.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,png))
 $(eval $(call gb_UnpackedTarball_set_tarball,png,$(PNG_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_files,png,.,\
-	libpng/configs/pnglibconf.h \
+	external/libpng/configs/pnglibconf.h \
 ))
 
 # vim: set noet sw=4 ts=4: