Makefile.in | 3 RepositoryModule_host.mk | 1 external/Module_external.mk | 3 external/libpng/Makefile | 7 + external/libpng/Module_libpng.mk | 21 +++ external/libpng/README | 1 external/libpng/StaticLibrary_png.mk | 39 +++++++ external/libpng/UnpackedTarball_png.mk | 18 +++ external/libpng/configs/pnglibconf.h | 178 +++++++++++++++++++++++++++++++++ libpng/Makefile | 7 - libpng/Module_libpng.mk | 21 --- libpng/README | 1 libpng/StaticLibrary_png.mk | 39 ------- libpng/UnpackedTarball_png.mk | 18 --- libpng/configs/pnglibconf.h | 178 --------------------------------- 15 files changed, 270 insertions(+), 265 deletions(-)
New commits: commit 99f8cf1221b216c301e000eab88d75dbe9e9aa20 Author: Bjoern Michaelsen <[email protected]> Date: Sat Oct 12 03:26:01 2013 +0200 fdo#70393: move libpng to a subdir of external Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93 Reviewed-on: https://gerrit.libreoffice.org/6231 Reviewed-by: Björn Michaelsen <[email protected]> Tested-by: Björn Michaelsen <[email protected]> diff --git a/Makefile.in b/Makefile.in index e417670..0aff4ca 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 08bac243..366a885 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 70f583f..99e49752 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 d2ac838..ed8aa59 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
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
