From 88b325aac5750561e76c6f5a4099b846af1a195b Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Tue, 23 Apr 2013 16:15:41 +0200
Subject: libmerged: add harfbuzz external

Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57
---
 Library_merged.mk  |  1 +
 vcl/Library_vcl.mk | 14 ++------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Library_merged.mk b/Library_merged.mk
index c540e59f7a71..2d5ef603de57 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	gio \
 	graphite \
 	$(if $(ENABLE_GTK),gtk) \
+	harfbuzz \
 	hunspell \
 	icui18n \
 	icule \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 824743814bcf..f1de72b9b79d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -98,24 +98,14 @@ endif
 
 $(eval $(call gb_Library_use_externals,vcl,\
 	boost_headers \
+	gio \
+	harfbuzz \
 	icule \
 	icuuc \
 	icu_headers \
 	lcms2 \
 ))
 
-ifneq ($(ENABLE_GIO),)
-$(eval $(call gb_Library_use_externals,vcl,\
-	gio \
-))
-endif
-
-ifeq ($(ENABLE_HARFBUZZ),TRUE)
-$(eval $(call gb_Library_use_externals,vcl,\
-	harfbuzz \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/app/brand \
     vcl/source/app/dbggui \
-- 
cgit