diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 3 | ||||
| -rw-r--r-- | external/libpng/Makefile (renamed from libpng/Makefile) | 0 | ||||
| -rw-r--r-- | external/libpng/Module_libpng.mk (renamed from libpng/Module_libpng.mk) | 0 | ||||
| -rw-r--r-- | external/libpng/README (renamed from libpng/README) | 0 | ||||
| -rw-r--r-- | external/libpng/StaticLibrary_png.mk (renamed from libpng/StaticLibrary_png.mk) | 0 | ||||
| -rw-r--r-- | external/libpng/UnpackedTarball_png.mk (renamed from libpng/UnpackedTarball_png.mk) | 2 | ||||
| -rw-r--r-- | external/libpng/configs/pnglibconf.h (renamed from libpng/configs/pnglibconf.h) | 0 |
9 files changed, 7 insertions, 2 deletions
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 index ccb1c85a04da..ccb1c85a04da 100644 --- a/libpng/Makefile +++ b/external/libpng/Makefile diff --git a/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk index d61375d18d05..d61375d18d05 100644 --- a/libpng/Module_libpng.mk +++ b/external/libpng/Module_libpng.mk diff --git a/libpng/README b/external/libpng/README index 8b9c8961179f..8b9c8961179f 100644 --- a/libpng/README +++ b/external/libpng/README diff --git a/libpng/StaticLibrary_png.mk b/external/libpng/StaticLibrary_png.mk index 8759cafc0fa0..8759cafc0fa0 100644 --- a/libpng/StaticLibrary_png.mk +++ b/external/libpng/StaticLibrary_png.mk diff --git a/libpng/UnpackedTarball_png.mk b/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 index 650098e10c4a..650098e10c4a 100644 --- a/libpng/configs/pnglibconf.h +++ b/external/libpng/configs/pnglibconf.h |