RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/libmwaw/ExternalProject_libmwaw.mk | 40 ++++++++++++++++++++++++++++
external/libmwaw/Makefile | 7 ++++
external/libmwaw/Module_libmwaw.mk | 17 +++++++++++
external/libmwaw/README | 3 ++
external/libmwaw/UnpackedTarball_libmwaw.mk | 14 +++++++++
libmwaw/ExternalProject_libmwaw.mk | 40 ----------------------------
libmwaw/Makefile | 7 ----
libmwaw/Module_libmwaw.mk | 21 --------------
libmwaw/README | 3 --
libmwaw/UnpackedTarball_libmwaw.mk | 14 ---------
12 files changed, 82 insertions(+), 86 deletions(-)
New commits:
commit 2728c6e8da276c1955878f766c71acd0fd59c9ce
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Fri Oct 18 20:09:12 2013 +0200
fdo#70393: move libmwaw to a subdir of external
Change-Id: I8ba2b928638cf3f16c4500eeaec5a5ce91dd85f6
Reviewed-on: https://gerrit.libreoffice.org/6332
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 87ece57..e058f04 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,MWAW,libmwaw) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 81c97ae..e3bcd47 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,LIBPNG,libpng) \
$(call gb_Helper_optional,MSPUB,libmspub) \
+ $(call gb_Helper_optional,MWAW,libmwaw) \
))
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/ExternalProject_libmwaw.mk
b/external/libmwaw/ExternalProject_libmwaw.mk
similarity index 100%
rename from libmwaw/ExternalProject_libmwaw.mk
rename to external/libmwaw/ExternalProject_libmwaw.mk
diff --git a/libmwaw/Makefile b/external/libmwaw/Makefile
similarity index 71%
rename from libmwaw/Makefile
rename to external/libmwaw/Makefile
index ccb1c85..e4968cf 100644
--- a/libmwaw/Makefile
+++ b/external/libmwaw/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/libmwaw/Module_libmwaw.mk b/external/libmwaw/Module_libmwaw.mk
similarity index 93%
rename from libmwaw/Module_libmwaw.mk
rename to external/libmwaw/Module_libmwaw.mk
index 36e7561..9ecb4cf 100644
--- a/libmwaw/Module_libmwaw.mk
+++ b/external/libmwaw/Module_libmwaw.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libmwaw))
-ifeq ($(SYSTEM_MWAW),NO)
-
$(eval $(call gb_Module_add_targets,libmwaw,\
ExternalProject_libmwaw \
UnpackedTarball_libmwaw \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/README b/external/libmwaw/README
similarity index 100%
rename from libmwaw/README
rename to external/libmwaw/README
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk
b/external/libmwaw/UnpackedTarball_libmwaw.mk
similarity index 100%
rename from libmwaw/UnpackedTarball_libmwaw.mk
rename to external/libmwaw/UnpackedTarball_libmwaw.mk
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
