[Libreoffice-commits] core.git: external/libmspub external/Module_external.mk libmspub/ExternalProject_libmspub.mk libmspub/Makefile libmspub/Module_libmspub.mk libmspub/README libmspub/UnpackedTarball_libmspub.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                      |    1 
 external/Module_external.mk                   |    1 
 external/libmspub/ExternalProject_libmspub.mk |   43 ++++++++++++++++++++++++++
 external/libmspub/Makefile                    |    7 ++++
 external/libmspub/Module_libmspub.mk          |   17 ++++++++++
 external/libmspub/README                      |    1 
 external/libmspub/UnpackedTarball_libmspub.mk |   14 ++++++++
 libmspub/ExternalProject_libmspub.mk          |   43 --------------------------
 libmspub/Makefile                             |    7 ----
 libmspub/Module_libmspub.mk                   |   21 ------------
 libmspub/README                               |    1 
 libmspub/UnpackedTarball_libmspub.mk          |   14 --------
 12 files changed, 83 insertions(+), 87 deletions(-)

New commits:
commit 1359fba53064d726d55853881d24d793598a5008
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 20:00:06 2013 +0200

    fdo#70393: move libmspub to a subdir of external
    
    Change-Id: Ib93e41b2ebd7f466c28e6a52ea6ad16dd216642e
    Reviewed-on: https://gerrit.libreoffice.org/6331
    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 7a2acad..87ece57 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,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 30249aa..81c97ae 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
+	$(call gb_Helper_optional,MSPUB,libmspub) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
similarity index 100%
rename from libmspub/ExternalProject_libmspub.mk
rename to external/libmspub/ExternalProject_libmspub.mk
diff --git a/libmspub/Makefile b/external/libmspub/Makefile
similarity index 71%
rename from libmspub/Makefile
rename to external/libmspub/Makefile
index ccb1c85..e4968cf 100644
--- a/libmspub/Makefile
+++ b/external/libmspub/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/libmspub/Module_libmspub.mk b/external/libmspub/Module_libmspub.mk
similarity index 93%
rename from libmspub/Module_libmspub.mk
rename to external/libmspub/Module_libmspub.mk
index 0755aca..81ea7e9 100644
--- a/libmspub/Module_libmspub.mk
+++ b/external/libmspub/Module_libmspub.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libmspub))
 
-ifeq ($(SYSTEM_MSPUB),NO)
-
 $(eval $(call gb_Module_add_targets,libmspub,\
 	ExternalProject_libmspub \
 	UnpackedTarball_libmspub \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libmspub/README b/external/libmspub/README
similarity index 100%
rename from libmspub/README
rename to external/libmspub/README
diff --git a/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
similarity index 100%
rename from libmspub/UnpackedTarball_libmspub.mk
rename to external/libmspub/UnpackedTarball_libmspub.mk