diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:12:43 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:36:47 +0000 |
| commit | 9b4b718b5b049aff0077202c26d057b14bc29511 (patch) | |
| tree | 73281b97da6b8fe927141aab6d1ee12ac9a4b668 | |
| parent | fdo#70393: move libmwaw to a subdir of external (diff) | |
| download | core-9b4b718b5b049aff0077202c26d057b14bc29511.tar.gz core-9b4b718b5b049aff0077202c26d057b14bc29511.zip | |
fdo#70393: move libodfgen to a subdir of external
Change-Id: If43571222806df4c3d25ab88eab3b1755f583d5a
Reviewed-on: https://gerrit.libreoffice.org/6333
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk (renamed from libodfgen/ExternalProject_libodfgen.mk) | 0 | ||||
| -rw-r--r-- | external/libodfgen/Makefile (renamed from libodfgen/Makefile) | 2 | ||||
| -rw-r--r-- | external/libodfgen/Module_libodfgen.mk (renamed from libodfgen/Module_libodfgen.mk) | 4 | ||||
| -rw-r--r-- | external/libodfgen/README (renamed from libodfgen/README) | 0 | ||||
| -rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk (renamed from libodfgen/UnpackedTarball_libodfgen.mk) | 0 |
7 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index e058f049b884..30e4e254b09e 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ librelogo \ $(call gb_Helper_optional,VISIO,libvisio) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index e3bcd470a8c6..5e60a64c6974 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ + $(call gb_Helper_optional,ODFGEN,libodfgen) \ )) # vim: set noet sw=4 ts=4: diff --git a/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 8514282c57b4..8514282c57b4 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk diff --git a/libodfgen/Makefile b/external/libodfgen/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libodfgen/Makefile +++ b/external/libodfgen/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/libodfgen/Module_libodfgen.mk b/external/libodfgen/Module_libodfgen.mk index ca58a2748f6c..d94d34f7c596 100644 --- a/libodfgen/Module_libodfgen.mk +++ b/external/libodfgen/Module_libodfgen.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libodfgen)) -ifeq ($(SYSTEM_ODFGEN),NO) - $(eval $(call gb_Module_add_targets,libodfgen,\ ExternalProject_libodfgen \ UnpackedTarball_libodfgen \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libodfgen/README b/external/libodfgen/README index efeffac5dc21..efeffac5dc21 100644 --- a/libodfgen/README +++ b/external/libodfgen/README diff --git a/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 1a7f26cf9a8c..1a7f26cf9a8c 100644 --- a/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk |