[Libreoffice-commits] .: vcl/util

[Caolán McNamara]

 vcl/util/makefile.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit fb467c3548dc0cc70ca32892ce3b819d8d9f1153
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 29 10:51:07 2010 +0100

    avoid linking against wrong libstlport by accident when linking against kde

diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 20723bf..e8221e4 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -402,7 +402,6 @@ SHL5IMPLIB=ikde_plug_
 SHL5LIBS=$(LIB5TARGET)
 SHL5DEPN=$(SHL2TARGETN)
 # libs for KDE plugin
-SHL5LINKFLAGS+=$(KDE_LIBS)
 SHL5STDLIBS+=-l$(SHL2TARGET)
 SHL5STDLIBS+=\
         $(VCLLIB)       \
@@ -416,6 +415,8 @@ SHL5STDLIBS+= $(XRANDR_LIBS)
 .ENDIF
 .ENDIF
 
+SHL5STDLIBS+=$(KDE_LIBS)
+
 .ENDIF # "$(ENABLE_KDE)" != ""
 
 # KDE4 plugin
@@ -430,7 +431,6 @@ SHL6IMPLIB=ikde4_plug_
 SHL6LIBS=$(LIB6TARGET)
 SHL6DEPN=$(SHL2TARGETN)
 # libs for KDE4 plugin
-SHL6LINKFLAGS+=$(KDE4_LIBS) $(KDE_GLIB_LIBS)
 SHL6STDLIBS+=-l$(SHL2TARGET)
 SHL6STDLIBS+=\
         $(VCLLIB)       \
@@ -445,6 +445,8 @@ SHL6STDLIBS+= $(XRANDR_LIBS)
 .ENDIF
 .ENDIF
 
+SHL6STDLIBS+=$(KDE4_LIBS) $(KDE_GLIB_LIBS)
+
 .ENDIF # "$(ENABLE_KDE4)" != ""
 
 .ENDIF # UNX