[Libreoffice-commits] core.git: external/harfbuzz external/Module_external.mk harfbuzz/ExternalProject_harfbuzz.mk harfbuzz/Makefile harfbuzz/Module_harfbuzz.mk harfbuzz/README harfbuzz/UnpackedTarball_harfbuzz.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                      |    1 
 external/Module_external.mk                   |    6 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |   36 ++++++++++++++++++++++++++
 external/harfbuzz/Makefile                    |    7 +++++
 external/harfbuzz/Module_harfbuzz.mk          |   17 ++++++++++++
 external/harfbuzz/README                      |    1 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |   14 ++++++++++
 harfbuzz/ExternalProject_harfbuzz.mk          |   36 --------------------------
 harfbuzz/Makefile                             |    7 -----
 harfbuzz/Module_harfbuzz.mk                   |   21 ---------------
 harfbuzz/README                               |    1 
 harfbuzz/UnpackedTarball_harfbuzz.mk          |   14 ----------
 12 files changed, 79 insertions(+), 82 deletions(-)

New commits:
commit 268a3214073f95371b7e5ae35b95ca01967f0494
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Oct 16 19:59:27 2013 +0200

    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 at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 366a885..27b3c07 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 538b3fd..48d7842 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
similarity index 100%
rename from harfbuzz/ExternalProject_harfbuzz.mk
rename to external/harfbuzz/ExternalProject_harfbuzz.mk
diff --git a/harfbuzz/Makefile b/external/harfbuzz/Makefile
similarity index 100%
rename from harfbuzz/Makefile
rename to external/harfbuzz/Makefile
diff --git a/harfbuzz/Module_harfbuzz.mk b/external/harfbuzz/Module_harfbuzz.mk
similarity index 89%
rename from harfbuzz/Module_harfbuzz.mk
rename to external/harfbuzz/Module_harfbuzz.mk
index af64eff..ffbadd7 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
similarity index 100%
rename from harfbuzz/README
rename to external/harfbuzz/README
diff --git a/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
similarity index 100%
rename from harfbuzz/UnpackedTarball_harfbuzz.mk
rename to external/harfbuzz/UnpackedTarball_harfbuzz.mk