From 99f8cf1221b216c301e000eab88d75dbe9e9aa20 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 12 Oct 2013 03:26:01 +0200
Subject: [PATCH] fdo#70393: move libpng to a subdir of external
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
---
 Makefile.in                                        | 3 +++
 RepositoryModule_host.mk                           | 1 -
 external/Module_external.mk                        | 3 +++
 {libpng => external/libpng}/Makefile               | 0
 {libpng => external/libpng}/Module_libpng.mk       | 0
 {libpng => external/libpng}/README                 | 0
 {libpng => external/libpng}/StaticLibrary_png.mk   | 0
 {libpng => external/libpng}/UnpackedTarball_png.mk | 2 +-
 {libpng => external/libpng}/configs/pnglibconf.h   | 0
 9 files changed, 7 insertions(+), 2 deletions(-)
 rename {libpng => external/libpng}/Makefile (100%)
 rename {libpng => external/libpng}/Module_libpng.mk (100%)
 rename {libpng => external/libpng}/README (100%)
 rename {libpng => external/libpng}/StaticLibrary_png.mk (100%)
 rename {libpng => external/libpng}/UnpackedTarball_png.mk (92%)
 rename {libpng => external/libpng}/configs/pnglibconf.h (100%)

diff --git a/Makefile.in b/Makefile.in
index e417670feae5..0aff4cabd50c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,6 +186,9 @@ distclean : clean compilerplugins-clean
 cmd:
 	echo "custom cmd" && ( $(cmd) )
 
+usedcxxfiles:
+	$(GNUMAKE) -f $(SRCDIR)/Makefile.gbuild $(@)
+
 #
 # Fetch
 #
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 08bac24377bd..366a885d0281 100644
--- a/RepositoryModule_host.mk
+++ b/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) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 70f583f5b02f..99e49752d40d 100644
--- a/external/Module_external.mk
+++ b/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:
diff --git a/libpng/Makefile b/external/libpng/Makefile
similarity index 100%
rename from libpng/Makefile
rename to external/libpng/Makefile
diff --git a/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
similarity index 100%
rename from libpng/Module_libpng.mk
rename to external/libpng/Module_libpng.mk
diff --git a/libpng/README b/external/libpng/README
similarity index 100%
rename from libpng/README
rename to external/libpng/README
diff --git a/libpng/StaticLibrary_png.mk b/external/libpng/StaticLibrary_png.mk
similarity index 100%
rename from libpng/StaticLibrary_png.mk
rename to external/libpng/StaticLibrary_png.mk
diff --git a/libpng/UnpackedTarball_png.mk b/external/libpng/UnpackedTarball_png.mk
similarity index 92%
rename from libpng/UnpackedTarball_png.mk
rename to external/libpng/UnpackedTarball_png.mk
index d2ac83891b16..ed8aa59c8493 100644
--- a/libpng/UnpackedTarball_png.mk
+++ b/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:
diff --git a/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h
similarity index 100%
rename from libpng/configs/pnglibconf.h
rename to external/libpng/configs/pnglibconf.h