diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-13 16:11:39 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 14:04:46 +0200 |
| commit | e76747258575e88fe1b4e232701de6e5a9056d2e (patch) | |
| tree | 73e13da3c19f56908b5aac3f7c4eefd1a371a6aa /vcl/Library_vclplug_gtk.mk | |
| parent | 4a07f45fbd93391e6c46ab4a7256ab795efda858 (diff) | |
gnumake4: vcl: adapt makefiles to gnumake4 changes [hg:4a760b654a05]
Diffstat (limited to 'vcl/Library_vclplug_gtk.mk')
| -rwxr-xr-x | vcl/Library_vclplug_gtk.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index feb63e06e794..f81c784dc1a0 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vclplug_gtk,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_gtk,\ + $$(INCLUDE) \ $$(GTK_CFLAGS) \ )) @@ -53,14 +53,12 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\ $$(DEFS) \ -DENABLE_DBUS \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ $(shell pkg-config --libs dbus-glib-1)\ )) endif -$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ $$(GTK_LIBS) \ $$(GTHREAD_LIBS) \ )) |