diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:15:14 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:37:21 +0000 |
| commit | 392726f04252fa3802ade7c31ca65fac57896861 (patch) | |
| tree | a8e920693569866d0fd318c0b375de57b1dbdbce | |
| parent | 9b4b718b5b049aff0077202c26d057b14bc29511 (diff) | |
fdo#70393: move liborcus to a subdir of external
Change-Id: Ibdf8c9fc9d7d2639ebd440ff2d833ab37ae76d98
Reviewed-on: https://gerrit.libreoffice.org/6334
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk (renamed from liborcus/ExternalProject_liborcus.mk) | 0 | ||||
| -rw-r--r-- | external/liborcus/Makefile (renamed from liborcus/Makefile) | 2 | ||||
| -rw-r--r-- | external/liborcus/Module_liborcus.mk (renamed from liborcus/Module_liborcus.mk) | 4 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk (renamed from liborcus/UnpackedTarball_liborcus.mk) | 2 | ||||
| -rw-r--r-- | external/liborcus/liborcus_0.1.0-configure.patch (renamed from liborcus/liborcus_0.1.0-configure.patch) | 0 | ||||
| -rw-r--r-- | external/liborcus/liborcus_0.1.0-dllimport.patch (renamed from liborcus/liborcus_0.1.0-dllimport.patch) | 0 | ||||
| -rw-r--r-- | external/liborcus/liborcus_0.1.0-tac.patch (renamed from liborcus/liborcus_0.1.0-tac.patch) | 0 | ||||
| -rw-r--r-- | external/liborcus/visibility.patch (renamed from liborcus/visibility.patch) | 0 |
10 files changed, 3 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 30e4e254b09e..aa47dfb47284 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 5e60a64c6974..13846f4d7734 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 index 649742011223..649742011223 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk diff --git a/liborcus/Makefile b/external/liborcus/Makefile index ccb1c85a04da..e4968cf85fb6 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 index e3c963951436..42f17159faec 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 index cb615736e337..9e2df47937c6 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 index ae8502e417f0..ae8502e417f0 100644 --- a/liborcus/liborcus_0.1.0-configure.patch +++ b/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 index 6255d060a492..6255d060a492 100644 --- a/liborcus/liborcus_0.1.0-dllimport.patch +++ b/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 index 01c77a9565f2..01c77a9565f2 100644 --- a/liborcus/liborcus_0.1.0-tac.patch +++ b/external/liborcus/liborcus_0.1.0-tac.patch diff --git a/liborcus/visibility.patch b/external/liborcus/visibility.patch index a5af6398b839..a5af6398b839 100644 --- a/liborcus/visibility.patch +++ b/external/liborcus/visibility.patch |