summaryrefslogtreecommitdiff
path: root/vcl/Library_vclplug_gen.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:07:24 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-22 21:07:24 +0200
commitc81f9104b6b6a91588c7a74bbb50a0c9c9729e1a (patch)
treebe3b7a4178a549d061ca397081fa5589ddbf8d03 /vcl/Library_vclplug_gen.mk
parenta233dac0653f3f3054f7ad2da114ed989747e89a (diff)
postmerge fixes for gnumake4
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
-rw-r--r--vcl/Library_vclplug_gen.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 819d9ce8c301..895afe2680c4 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -67,17 +67,17 @@ $(call gb_Library_use_externals,vclplug_gen,\
icuuc \
)
-))
+ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
$$(LDFLAGS) \
$$(CAIRO_LIBS) \
))
else
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vclplug_gen,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
+
$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
cairo \
))