RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/liborcus/ExternalProject_liborcus.mk | 100 +++++++++++++++++++++++
external/liborcus/Makefile | 7 +
external/liborcus/Module_liborcus.mk | 17 +++
external/liborcus/UnpackedTarball_liborcus.mk | 41 +++++++++
external/liborcus/liborcus_0.1.0-configure.patch | 20 ++++
external/liborcus/liborcus_0.1.0-dllimport.patch | 18 ++++
external/liborcus/liborcus_0.1.0-tac.patch | 20 ++++
external/liborcus/visibility.patch | 11 ++
liborcus/ExternalProject_liborcus.mk | 100 -----------------------
liborcus/Makefile | 7 -
liborcus/Module_liborcus.mk | 21 ----
liborcus/UnpackedTarball_liborcus.mk | 41 ---------
liborcus/liborcus_0.1.0-configure.patch | 20 ----
liborcus/liborcus_0.1.0-dllimport.patch | 18 ----
liborcus/liborcus_0.1.0-tac.patch | 20 ----
liborcus/visibility.patch | 11 --
18 files changed, 235 insertions(+), 239 deletions(-)
New commits:
commit 392726f04252fa3802ade7c31ca65fac57896861
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Fri Oct 18 22:15:14 2013 +0200
fdo#70393: move liborcus to a subdir of external
Change-Id: Ibdf8c9fc9d7d2639ebd440ff2d833ab37ae76d98
Reviewed-on: https://gerrit.libreoffice.org/6334
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 30e4e25..aa47dfb 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,ORCUS,liborcus) \
librelogo \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 5e60a64..13846f4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
+ $(call gb_Helper_optional,ORCUS,liborcus) \
))
# vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
similarity index 100%
rename from liborcus/ExternalProject_liborcus.mk
rename to external/liborcus/ExternalProject_liborcus.mk
diff --git a/liborcus/Makefile b/external/liborcus/Makefile
similarity index 71%
rename from liborcus/Makefile
rename to external/liborcus/Makefile
index ccb1c85..e4968cf 100644
--- a/liborcus/Makefile
+++ b/external/liborcus/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/liborcus/Module_liborcus.mk b/external/liborcus/Module_liborcus.mk
similarity index 89%
rename from liborcus/Module_liborcus.mk
rename to external/liborcus/Module_liborcus.mk
index e3c9639..42f1715 100644
--- a/liborcus/Module_liborcus.mk
+++ b/external/liborcus/Module_liborcus.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,liborcus))
-ifeq ($(ENABLE_ORCUS)-$(SYSTEM_LIBORCUS),TRUE-NO)
-
$(eval $(call gb_Module_add_targets,liborcus,\
ExternalProject_liborcus \
UnpackedTarball_liborcus \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
similarity index 94%
rename from liborcus/UnpackedTarball_liborcus.mk
rename to external/liborcus/UnpackedTarball_liborcus.mk
index cb61573..9e2df47 100644
--- a/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -35,7 +35,7 @@ endif
# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
- $(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
+ $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
))
# vim: set noet sw=4 ts=4:
diff --git a/liborcus/liborcus_0.1.0-configure.patch
b/external/liborcus/liborcus_0.1.0-configure.patch
similarity index 100%
rename from liborcus/liborcus_0.1.0-configure.patch
rename to external/liborcus/liborcus_0.1.0-configure.patch
diff --git a/liborcus/liborcus_0.1.0-dllimport.patch
b/external/liborcus/liborcus_0.1.0-dllimport.patch
similarity index 100%
rename from liborcus/liborcus_0.1.0-dllimport.patch
rename to external/liborcus/liborcus_0.1.0-dllimport.patch
diff --git a/liborcus/liborcus_0.1.0-tac.patch
b/external/liborcus/liborcus_0.1.0-tac.patch
similarity index 100%
rename from liborcus/liborcus_0.1.0-tac.patch
rename to external/liborcus/liborcus_0.1.0-tac.patch
diff --git a/liborcus/visibility.patch b/external/liborcus/visibility.patch
similarity index 100%
rename from liborcus/visibility.patch
rename to external/liborcus/visibility.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
