Library_merged.mk | 1 +
vcl/Library_vcl.mk | 14 ++------------
2 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit 88b325aac5750561e76c6f5a4099b846af1a195b
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Apr 23 16:15:41 2013 +0200
libmerged: add harfbuzz external
Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57
diff --git a/Library_merged.mk b/Library_merged.mk
index c540e59..2d5ef60 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 8247438..f1de72b 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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
