diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-16 19:59:27 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-17 09:50:18 +0000 |
| commit | 268a3214073f95371b7e5ae35b95ca01967f0494 (patch) | |
| tree | b4f6bb87917ca11bdec1a06368e0e4a11c28c6ae | |
| parent | d879a74ee2d8baad5de4edc4e13144d3cc0c6bf0 (diff) | |
fdo#70393: move harfbuzz to a subdir of external
Change-Id: I3eaa6d95aaa1753822e20d21f90f39cadb939332
Reviewed-on: https://gerrit.libreoffice.org/6276
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 6 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk (renamed from harfbuzz/ExternalProject_harfbuzz.mk) | 0 | ||||
| -rw-r--r-- | external/harfbuzz/Makefile (renamed from harfbuzz/Makefile) | 0 | ||||
| -rw-r--r-- | external/harfbuzz/Module_harfbuzz.mk (renamed from harfbuzz/Module_harfbuzz.mk) | 4 | ||||
| -rw-r--r-- | external/harfbuzz/README (renamed from harfbuzz/README) | 0 | ||||
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk (renamed from harfbuzz/UnpackedTarball_harfbuzz.mk) | 0 |
7 files changed, 4 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 366a885d0281..27b3c07cf805 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ framework \ $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ - $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 538b3fdeaa9c..48d7842c5c34 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -17,7 +17,9 @@ ifeq ($(COM),MSC) $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif -$(call gb_Helper_optional,LIBPNG,\ - $(eval $(call gb_Module_add_moduledir,external,libpng))) +$(eval $(call gb_Module_add_moduledirs,external,\ + $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ + $(call gb_Helper_optional,LIBPNG,libpng) \ +)) # vim: set noet sw=4 ts=4: diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index f49553d4b6c8..f49553d4b6c8 100644 --- a/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk diff --git a/harfbuzz/Makefile b/external/harfbuzz/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/harfbuzz/Makefile +++ b/external/harfbuzz/Makefile diff --git a/harfbuzz/Module_harfbuzz.mk b/external/harfbuzz/Module_harfbuzz.mk index af64eff699e8..ffbadd7107a7 100644 --- a/harfbuzz/Module_harfbuzz.mk +++ b/external/harfbuzz/Module_harfbuzz.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,harfbuzz)) -ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),TRUE-NO) - $(eval $(call gb_Module_add_targets,harfbuzz,\ ExternalProject_harfbuzz \ UnpackedTarball_harfbuzz \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/harfbuzz/README b/external/harfbuzz/README index d2af8b559ad1..d2af8b559ad1 100644 --- a/harfbuzz/README +++ b/external/harfbuzz/README diff --git a/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 0bda2a186e2a..0bda2a186e2a 100644 --- a/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk |