[Libreoffice-commits] core.git: external/libodfgen external/Module_external.mk libodfgen/ExternalProject_libodfgen.mk libodfgen/Makefile libodfgen/Module_libodfgen.mk libodfgen/README libodfgen/UnpackedTarball_libodfgen.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                        |    1 
 external/Module_external.mk                     |    1 
 external/libodfgen/ExternalProject_libodfgen.mk |   41 ++++++++++++++++++++++++
 external/libodfgen/Makefile                     |    7 ++++
 external/libodfgen/Module_libodfgen.mk          |   17 +++++++++
 external/libodfgen/README                       |    1 
 external/libodfgen/UnpackedTarball_libodfgen.mk |   14 ++++++++
 libodfgen/ExternalProject_libodfgen.mk          |   41 ------------------------
 libodfgen/Makefile                              |    7 ----
 libodfgen/Module_libodfgen.mk                   |   21 ------------
 libodfgen/README                                |    1 
 libodfgen/UnpackedTarball_libodfgen.mk          |   14 --------
 12 files changed, 81 insertions(+), 85 deletions(-)

New commits:
commit 9b4b718b5b049aff0077202c26d057b14bc29511
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:12:43 2013 +0200

    fdo#70393: move libodfgen to a subdir of external
    
    Change-Id: If43571222806df4c3d25ab88eab3b1755f583d5a
    Reviewed-on: https://gerrit.libreoffice.org/6333
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e058f04..30e4e25 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 e3bcd47..5e60a64 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
similarity index 100%
rename from libodfgen/ExternalProject_libodfgen.mk
rename to external/libodfgen/ExternalProject_libodfgen.mk
diff --git a/libodfgen/Makefile b/external/libodfgen/Makefile
similarity index 71%
rename from libodfgen/Makefile
rename to external/libodfgen/Makefile
index ccb1c85..e4968cf 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
similarity index 93%
rename from libodfgen/Module_libodfgen.mk
rename to external/libodfgen/Module_libodfgen.mk
index ca58a27..d94d34f 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
similarity index 100%
rename from libodfgen/README
rename to external/libodfgen/README
diff --git a/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
similarity index 100%
rename from libodfgen/UnpackedTarball_libodfgen.mk
rename to external/libodfgen/UnpackedTarball_libodfgen.mk