diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:43:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:52:43 -0600 |
| commit | 112c60b48463e30e930c0856ebf37461697a0863 (patch) | |
| tree | 8879fda9923ead049fc27ac1a0e386d771e6f159 | |
| parent | a06d8eb9a92a438de6677d5e4196da0919aa790d (diff) | |
fdo#70393: move vigra to a subdir of external
Change-Id: I98e2ae25865c4ec38da19a24ba4347540d170e4f
Reviewed-on: https://gerrit.libreoffice.org/6554
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 | ||||
| -rw-r--r-- | external/vigra/Makefile (renamed from vigra/Makefile) | 2 | ||||
| -rw-r--r-- | external/vigra/Module_vigra.mk (renamed from vigra/Module_vigra.mk) | 0 | ||||
| -rw-r--r-- | external/vigra/README (renamed from vigra/README) | 0 | ||||
| -rw-r--r-- | external/vigra/UnpackedTarball_vigra.mk (renamed from vigra/UnpackedTarball_vigra.mk) | 4 | ||||
| -rw-r--r-- | external/vigra/vigra1.6.0-unused-parameters.patch (renamed from vigra/vigra1.6.0-unused-parameters.patch) | 0 | ||||
| -rw-r--r-- | external/vigra/vigra1.6.0.patch (renamed from vigra/vigra1.6.0.patch) | 0 |
9 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 1a4c033dda50..4ef18d802a2e 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ ucb \ unoxml \ vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ xmloff \ xmlscript \ ) \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 92ff4f131a3a..ccae97c2f5cf 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -144,7 +144,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ uui \ vbahelper \ vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ wizards \ writerfilter \ writerperfect \ diff --git a/external/Module_external.mk b/external/Module_external.mk index f5484e400e34..d6c1184bffc8 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,UCPP,ucpp) \ + $(call gb_Helper_optional,VIGRA,vigra) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ @@ -83,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,NSS,nss) \ + $(call gb_Helper_optional,VIGRA,vigra) \ ) \ ) \ )) diff --git a/vigra/Makefile b/external/vigra/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/vigra/Makefile +++ b/external/vigra/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/vigra/Module_vigra.mk b/external/vigra/Module_vigra.mk index af2369f31323..af2369f31323 100644 --- a/vigra/Module_vigra.mk +++ b/external/vigra/Module_vigra.mk diff --git a/vigra/README b/external/vigra/README index c24f9423ff00..c24f9423ff00 100644 --- a/vigra/README +++ b/external/vigra/README diff --git a/vigra/UnpackedTarball_vigra.mk b/external/vigra/UnpackedTarball_vigra.mk index efab47817790..c368e2183db0 100644 --- a/vigra/UnpackedTarball_vigra.mk +++ b/external/vigra/UnpackedTarball_vigra.mk @@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra)) $(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,vigra,\ - vigra/vigra1.6.0.patch \ + external/vigra/vigra1.6.0.patch \ $(if $(filter GCC,$(COM)), \ - vigra/vigra1.6.0-unused-parameters.patch) \ + external/vigra/vigra1.6.0-unused-parameters.patch) \ )) # vim: set noet sw=4 ts=4: diff --git a/vigra/vigra1.6.0-unused-parameters.patch b/external/vigra/vigra1.6.0-unused-parameters.patch index 7e23531bad6f..7e23531bad6f 100644 --- a/vigra/vigra1.6.0-unused-parameters.patch +++ b/external/vigra/vigra1.6.0-unused-parameters.patch diff --git a/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch index db57c2e28522..db57c2e28522 100644 --- a/vigra/vigra1.6.0.patch +++ b/external/vigra/vigra1.6.0.patch |