summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:17 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:17 +0200
commit0692507dcc62e94c7af88388961db1d7d12d6dbd (patch)
treea3aa09e78c767d8f1356891b0a253ff9cf0c3ef0 /vcl
parent713088c4b7bf29bc71e1acd3b9eafb0327f5e89e (diff)
fixing rebase errors
Diffstat (limited to 'vcl')
-rwxr-xr-xvcl/Library_vcl.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 900ac3aca526..a2f430eb39de 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -431,6 +431,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/glyphs/graphite_serverfont \
))
endif
+
+$(call gb_Library_use_external,vcl,graphite)
endif
ifeq ($(OS),LINUX)
@@ -451,8 +453,6 @@ $(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib \
))
endif
-
-$(call gb_Library_use_external,vcl,graphite)
endif
ifeq ($(GUIBASE),aqua)