diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 22:54:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:07 +0200 |
| commit | b05430409b3eb3a4b8649895788e025fc9a0d9a0 (patch) | |
| tree | d89ff30477fa1b33bd3b3033bafb0058b55539e9 /vcl/Library_vclplug_gen.mk | |
| parent | 78b59b8302e79fad71bfff66d5b88db80527e6a1 (diff) | |
vcl: clean up that Xinerama linkage...
... odd duplication apparently due to wrong conversion from dmakefile.
Change-Id: I9a9e183373ec43fb0b1eadc2c233ce659bebd107
Diffstat (limited to 'vcl/Library_vclplug_gen.mk')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 46c5f522820c..d9a9d236944c 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -129,8 +129,8 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ## handle Xinerama ifneq ($(USE_XINERAMA),NO) -ifneq ($(OS),SOLARIS) -# not Solaris +ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) +# not Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XORG \ )) @@ -143,25 +143,12 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ )) endif -else -# Solaris +else # Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ -DUSE_XINERAMA_XSUN \ )) -ifeq ($(USE_XINERAMA_VERSION),Xorg) -# Solaris, Xorg -ifeq ($(XINERAMA_LINK),dynamic) -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -lXinerama \ -)) -else -$(eval $(call gb_Library_add_libs,vclplug_gen,\ - -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \ -)) -endif -endif -endif endif +endif # USE_XINERAMA ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_libraries,vclplug_gen,\ |