Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 0ae84fe759
commit 5a599bd048

@ -17,15 +17,15 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
kconfdir = $(libdir)/kconf_update_bin kconfdir = $(libdir)/kconf_update_bin
kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kopete_account_kconf_update_LDADD = $(LIB_QT) kopete_account_kconf_update_LDADD = $(LIB_QT)
kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT) kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_KDECORE) kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_KDECORE)
# vim: set noet: # vim: set noet:

@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = libkopete_videodevice.la lib_LTLIBRARIES = libkopete_videodevice.la
noinst_LTLIBRARIES = libkvideoio.la noinst_LTLIBRARIES = libkvideoio.la
libkopete_videodevice_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \ noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
videodevicemodelpool.h videodevicepool.h videoinput.h \ videodevicemodelpool.h videodevicepool.h videoinput.h \

@ -5,7 +5,7 @@ METASOURCES = AUTO
check_PROGRAMS = smpppdcstests check_PROGRAMS = smpppdcstests
smpppdcstests_SOURCES = main.cpp clienttest.cpp smpppdcstests_SOURCES = main.cpp clienttest.cpp
smpppdcstests_LDFLAGS = $(KDE_RPATH) $(all_libraries) smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
noinst_HEADERS = clienttest.h noinst_HEADERS = clienttest.h

@ -3,7 +3,7 @@ METASOURCES = AUTO
check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp
kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kunittest_LDADD = $(LIB_KDECORE) ../liboscar.la kunittest_LDADD = $(LIB_KDECORE) ../liboscar.la
clientstream_test_SOURCES = clientstream_test.cpp clientstream_test_SOURCES = clientstream_test.cpp

@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui
noinst_HEADERS = krdpview.h rdphostpref.h noinst_HEADERS = krdpview.h rdphostpref.h
librdp_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG) librdp_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG)
librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -15,6 +15,6 @@ check_PROGRAMS = ksttest
ksttest_SOURCES = ksttest.cpp ksttest_SOURCES = ksttest.cpp
ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_KDEUI) ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_KDEUI)
ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -13,11 +13,11 @@ check_PROGRAMS = testview dccMgrTest
testview_SOURCES = kstextviewtest.cpp testview_SOURCES = kstextviewtest.cpp
testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
dccMgrTest_SOURCES = dccMgrTest.cpp dccMgrTest_SOURCES = dccMgrTest.cpp
dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =

Loading…
Cancel
Save