[Libreoffice-commits] core.git: external/libwps external/Module_external.mk libwps/ExternalProject_libwps.mk libwps/Makefile libwps/Module_libwps.mk libwps/README libwps/UnpackedTarball_libwps.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                  |    1 
 external/Module_external.mk               |    1 
 external/libwps/ExternalProject_libwps.mk |   40 ++++++++++++++++++++++++++++++
 external/libwps/Makefile                  |    7 +++++
 external/libwps/Module_libwps.mk          |   17 ++++++++++++
 external/libwps/README                    |    1 
 external/libwps/UnpackedTarball_libwps.mk |   14 ++++++++++
 libwps/ExternalProject_libwps.mk          |   40 ------------------------------
 libwps/Makefile                           |    7 -----
 libwps/Module_libwps.mk                   |   21 ---------------
 libwps/README                             |    1 
 libwps/UnpackedTarball_libwps.mk          |   14 ----------
 12 files changed, 80 insertions(+), 84 deletions(-)

New commits:
commit 27d0ddf6b4526ffdf2e166e20a03a4c40a0f9936
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:22:34 2013 +0200

    fdo#70393: move libwps to a subdir of external
    
    Change-Id: Ib7c85b6004f4cf1cc3a3ecf280d9c99fb2e7297f
    Reviewed-on: https://gerrit.libreoffice.org/6338
    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 f89f6b3..cc3d4d6 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	librelogo \
-	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	libxmlsec \
 	$(call gb_Helper_optional,LIBXSLT,libxslt) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 840081a..a583184 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
+	$(call gb_Helper_optional,WPS,libwps) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
similarity index 100%
rename from libwps/ExternalProject_libwps.mk
rename to external/libwps/ExternalProject_libwps.mk
diff --git a/libwps/Makefile b/external/libwps/Makefile
similarity index 71%
rename from libwps/Makefile
rename to external/libwps/Makefile
index ccb1c85..e4968cf 100644
--- a/libwps/Makefile
+++ b/external/libwps/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/libwps/Module_libwps.mk b/external/libwps/Module_libwps.mk
similarity index 93%
rename from libwps/Module_libwps.mk
rename to external/libwps/Module_libwps.mk
index ee163f0..a6870fa 100644
--- a/libwps/Module_libwps.mk
+++ b/external/libwps/Module_libwps.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libwps))
 
-ifeq ($(SYSTEM_WPS),NO)
-
 $(eval $(call gb_Module_add_targets,libwps,\
 	ExternalProject_libwps \
 	UnpackedTarball_libwps \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libwps/README b/external/libwps/README
similarity index 100%
rename from libwps/README
rename to external/libwps/README
diff --git a/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
similarity index 100%
rename from libwps/UnpackedTarball_libwps.mk
rename to external/libwps/UnpackedTarball_libwps.mk