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_gen.mk | |
| parent | 4a07f45fbd93391e6c46ab4a7256ab795efda858 (diff) | |
gnumake4: vcl: adapt makefiles to gnumake4 changes [hg:4a760b654a05]
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
| -rwxr-xr-x | vcl/Library_vclplug_gen.mk | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 52f4d7a362e9..263d7b1ebc75 100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -126,12 +126,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ -DUSE_RANDR \ )) ifeq ($(XRANDR_DLOPEN),FALSE) -$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Library_set_include,vclplug_gen,\ + $$(INCLUDE) \ $$(XRANDR_CFLAGS) \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(XRANDR_LIBS) \ )) else @@ -151,13 +150,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif @@ -170,13 +167,11 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ ifeq ($(USE_XINERAMA_VERSION),Xorg) # Solaris, Xorg ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXinerama \ )) else -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif @@ -190,8 +185,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ $$(DEFS) \ -DXRENDER_LINK \ )) -$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(shell pkg-config --libs xrender) \ )) endif |