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_gtk3.mk | |
| parent | 2804ecc0fe40f8317050043b169396845b1b520d (diff) | |
update gnumake pieces for system cairo
Diffstat (limited to 'vcl/Library_vclplug_gtk3.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 587d69376500..045ade7a1106 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -35,13 +35,12 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_cxxflags,vclplug_gtk3,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\ + $$(INCLUDE) \ $$(GTK3_CFLAGS) \ )) -$(eval $(call gb_Library_set_defs,vclplug_gtk3,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DVCLPLUG_GTK_IMPLEMENTATION \ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ )) @@ -56,18 +55,15 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\ $$(INCLUDE) \ $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \ )) -$(eval $(call gb_Library_set_defs,vclplug_gtk3,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vclplug_gtk3,\ -DENABLE_DBUS \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gtk3,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $(shell pkg-config --libs dbus-glib-1)\ )) endif -$(eval $(call gb_Library_set_ldflags,vclplug_gtk3,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $$(GTK3_LIBS) \ $$(GTHREAD_LIBS) \ )) @@ -80,10 +76,9 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\ sot \ ucbhelper \ basegfx \ + basebmp \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ |