diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-29 10:51:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-29 10:51:07 +0100 |
| commit | e321ace4d878331cdb862f47c31741cb44c74da3 (patch) | |
| tree | 2451c8ad25e2ae1d216de90186168f3b6c914b51 /vcl | |
| parent | 7cb6bbca6669972bdcc7843c8a447fb4dde83774 (diff) | |
avoid linking against wrong libstlport by accident when linking against kde
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/util/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 20723bf7ada8..e8221e41ae3a 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 |