diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-07-25 14:10:55 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-25 14:19:45 +0100 |
commit | 67f11e53d03467ab664b8cfa23d69bacc777b714 (patch) | |
tree | a63b030e99bfb88858ec6e936aedb571c6fdf959 /vcl/Library_vclplug_gen.mk | |
parent | 2804ecc0fe40f8317050043b169396845b1b520d (diff) |
update gnumake pieces for system cairo
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
-rw-r--r-- | vcl/Library_vclplug_gen.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 99b319e453fa..8f5a2ebd16f2 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -67,21 +67,7 @@ $(eval $(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_add_cxxflags,vclplug_gen,\ - $$(FONTCONFIG_CFLAGS) \ - $$(FREETYPE_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ - cairo \ -)) -endif +$(eval $(call gb_Library_use_external,vclplug_gen,cairo)) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/app/i18n_cb \ |