[Libreoffice-commits] core.git: external/libwpd external/Module_external.mk libwpd/ExternalProject_libwpd.mk libwpd/Makefile libwpd/Module_libwpd.mk libwpd/README libwpd/UnpackedTarball_libwpd.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                  |    1 
 external/Module_external.mk               |    1 
 external/libwpd/ExternalProject_libwpd.mk |   34 ++++++++++++++++++++++++++++++
 external/libwpd/Makefile                  |    7 ++++++
 external/libwpd/Module_libwpd.mk          |   17 +++++++++++++++
 external/libwpd/README                    |    1 
 external/libwpd/UnpackedTarball_libwpd.mk |   14 ++++++++++++
 libwpd/ExternalProject_libwpd.mk          |   34 ------------------------------
 libwpd/Makefile                           |    7 ------
 libwpd/Module_libwpd.mk                   |   21 ------------------
 libwpd/README                             |    1 
 libwpd/UnpackedTarball_libwpd.mk          |   14 ------------
 12 files changed, 74 insertions(+), 78 deletions(-)

New commits:
commit c979511247aff27d33941b3c73224d948bcfceb2
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:19:06 2013 +0200

    fdo#70393: move libwpd to a subdir of external
    
    Change-Id: I599cf45b455b59e082078d6b2d5ed2efb99b5862
    Reviewed-on: https://gerrit.libreoffice.org/6336
    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 835e41e..b58e73e 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,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2072aac..59c83e4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
+	$(call gb_Helper_optional,WPD,libwpd) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk
similarity index 100%
rename from libwpd/ExternalProject_libwpd.mk
rename to external/libwpd/ExternalProject_libwpd.mk
diff --git a/libwpd/Makefile b/external/libwpd/Makefile
similarity index 71%
rename from libwpd/Makefile
rename to external/libwpd/Makefile
index ccb1c85..e4968cf 100644
--- a/libwpd/Makefile
+++ b/external/libwpd/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/libwpd/Module_libwpd.mk b/external/libwpd/Module_libwpd.mk
similarity index 93%
rename from libwpd/Module_libwpd.mk
rename to external/libwpd/Module_libwpd.mk
index f852c5c..5082c4a 100644
--- a/libwpd/Module_libwpd.mk
+++ b/external/libwpd/Module_libwpd.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libwpd))
 
-ifeq ($(SYSTEM_WPD),NO)
-
 $(eval $(call gb_Module_add_targets,libwpd,\
 	ExternalProject_libwpd \
 	UnpackedTarball_libwpd \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libwpd/README b/external/libwpd/README
similarity index 100%
rename from libwpd/README
rename to external/libwpd/README
diff --git a/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk
similarity index 100%
rename from libwpd/UnpackedTarball_libwpd.mk
rename to external/libwpd/UnpackedTarball_libwpd.mk