summaryrefslogtreecommitdiff
path: root/Library_merged.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-08-20 12:36:40 +0300
committerTor Lillqvist <tml@iki.fi>2012-08-20 13:04:41 +0300
commit0198ba86855809d07547de5e96ba4aa48233d81c (patch)
tree686d103b06d35c623909c44165e49030320b3a92 /Library_merged.mk
parent661b032902147a81f7557afac759880e7dadec11 (diff)
Use graphite only if ENABLE_GRAPHITE
Change-Id: I4e3274c43e34f6b28277ac75f96ae8c146e94c40
Diffstat (limited to 'Library_merged.mk')
-rw-r--r--Library_merged.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index da48a93df574..123e64ac80c3 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
- graphite \
icule \
icuuc \
jpeg \
@@ -57,6 +56,12 @@ $(eval $(call gb_Library_use_externals,merged,\
zlib \
))
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+$(eval $(call gb_Library_use_externals,merged,\
+ graphite \
+))
+endif
+
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,merged,\
berkeleydb \