summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-10-18 22:21:12 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-19 07:38:57 +0000
commit06c6846346e945f40ce4ab87261e9511d5e87e9c (patch)
treee5880837e0c54186b43a846255d998ef7d0ebf2f
parentc979511247aff27d33941b3c73224d948bcfceb2 (diff)
fdo#70393: move libwpg to a subdir of external
Change-Id: I28c0a18f9e85ca913a29f85e647a547cde2d40a1 Reviewed-on: https://gerrit.libreoffice.org/6337 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/libwpg/ExternalProject_libwpg.mk (renamed from libwpg/ExternalProject_libwpg.mk)0
-rw-r--r--external/libwpg/Makefile (renamed from libwpg/Makefile)2
-rw-r--r--external/libwpg/Module_libwpg.mk (renamed from libwpg/Module_libwpg.mk)4
-rw-r--r--external/libwpg/README (renamed from libwpg/README)0
-rw-r--r--external/libwpg/UnpackedTarball_libwpg.mk (renamed from libwpg/UnpackedTarball_libwpg.mk)0
7 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index b58e73e00eca..f89f6b391620 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,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
libxmlsec \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 59c83e4a70fd..840081a598e8 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
+ $(call gb_Helper_optional,WPG,libwpg) \
))
# vim: set noet sw=4 ts=4:
diff --git a/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk
index ee8bad38bb43..ee8bad38bb43 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/external/libwpg/ExternalProject_libwpg.mk
diff --git a/libwpg/Makefile b/external/libwpg/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/libwpg/Makefile
+++ b/external/libwpg/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/libwpg/Module_libwpg.mk b/external/libwpg/Module_libwpg.mk
index 411e71f9eb31..9e468a58a9cb 100644
--- a/libwpg/Module_libwpg.mk
+++ b/external/libwpg/Module_libwpg.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libwpg))
-ifeq ($(SYSTEM_WPG),NO)
-
$(eval $(call gb_Module_add_targets,libwpg,\
ExternalProject_libwpg \
UnpackedTarball_libwpg \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/libwpg/README b/external/libwpg/README
index 19a154dd4d44..19a154dd4d44 100644
--- a/libwpg/README
+++ b/external/libwpg/README
diff --git a/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk
index 7c76a958eaf5..7c76a958eaf5 100644
--- a/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk