RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 ++++++++
external/mdds/Makefile | 7 ++
external/mdds/Module_mdds.mk | 16 +++++
external/mdds/README | 4 +
external/mdds/UnpackedTarball_mdds.mk | 21 ++++++
external/mdds/mdds_0.6.0.patch | 54 +++++++++++++++++
mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 --------
mdds/Makefile | 7 --
mdds/Module_mdds.mk | 20 ------
mdds/README | 4 -
mdds/UnpackedTarball_mdds.mk | 21 ------
mdds/mdds_0.6.0.patch | 54 -----------------
14 files changed, 130 insertions(+), 134 deletions(-)
New commits:
commit 97d1923b6ccdef86f3d794b12e625ef0a7d88095
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Fri Oct 18 22:47:47 2013 +0200
fdo#70393: move mdds to a subdir of external
Change-Id: Idfb327f7217e459ab0328f8692e1f73aef248d32
Reviewed-on: https://gerrit.libreoffice.org/6343
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 99b24e1..5c33730 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
linguistic \
lotuswordpro \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
- $(call gb_Helper_optional,MDDS,mdds) \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 988d477..f4abc76 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
+ $(call gb_Helper_optional,MDDS,mdds) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/mdds/0001-Workaround-for-an-old-gcc-bug.patch
b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
similarity index 100%
rename from mdds/0001-Workaround-for-an-old-gcc-bug.patch
rename to external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
diff --git a/mdds/Makefile b/external/mdds/Makefile
similarity index 71%
rename from mdds/Makefile
rename to external/mdds/Makefile
index ccb1c85..e4968cf 100644
--- a/mdds/Makefile
+++ b/external/mdds/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/mdds/Module_mdds.mk b/external/mdds/Module_mdds.mk
similarity index 93%
rename from mdds/Module_mdds.mk
rename to external/mdds/Module_mdds.mk
index ac0f8a6..4774594 100644
--- a/mdds/Module_mdds.mk
+++ b/external/mdds/Module_mdds.mk
@@ -9,12 +9,8 @@
$(eval $(call gb_Module_Module,mdds))
-ifeq ($(SYSTEM_MDDS),NO)
-
$(eval $(call gb_Module_add_targets,mdds,\
UnpackedTarball_mdds \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/mdds/README b/external/mdds/README
similarity index 100%
rename from mdds/README
rename to external/mdds/README
diff --git a/mdds/UnpackedTarball_mdds.mk
b/external/mdds/UnpackedTarball_mdds.mk
similarity index 86%
rename from mdds/UnpackedTarball_mdds.mk
rename to external/mdds/UnpackedTarball_mdds.mk
index 69fbf18..1ccfc2a 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -14,8 +14,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
- mdds/mdds_0.6.0.patch \
- mdds/0001-Workaround-for-an-old-gcc-bug.patch \
+ external/mdds/mdds_0.6.0.patch \
+ external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch
similarity index 100%
rename from mdds/mdds_0.6.0.patch
rename to external/mdds/mdds_0.6.0.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
