summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
commit0451bfa1dfdda10f7a0dc04277066f10648d37f8 (patch)
treee372421b17ffb8ec9944e753c504a84873cf604c
parentbd4d40e62f0ade42fbc594c1c87dfc93dfab8c99 (diff)
downloadtdepim-0451bfa1dfdda10f7a0dc04277066f10648d37f8.tar.gz
tdepim-0451bfa1dfdda10f7a0dc04277066f10648d37f8.zip
Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--akregator/src/Makefile.am2
-rw-r--r--certmanager/Makefile.am2
-rw-r--r--certmanager/kwatchgnupg/Makefile.am2
-rw-r--r--kabc/frontend/Makefile.am2
-rw-r--r--kabc/kabc2mutt/Makefile.am2
-rw-r--r--kabc/kabcdistlistupdater/Makefile.am2
-rw-r--r--kaddressbook/Makefile.am2
-rw-r--r--kalarm/kalarmd/Makefile.am4
-rw-r--r--kandy/src/Makefile.am4
-rw-r--r--karm/Makefile.am2
-rw-r--r--karm/test/Makefile.am4
-rw-r--r--kitchensync/src/Makefile.am2
-rw-r--r--kmailcvt/Makefile.am2
-rw-r--r--kmobile/Makefile.am4
-rw-r--r--knode/Makefile.am2
-rw-r--r--knotes/Makefile.am2
-rw-r--r--kode/Makefile.am2
-rw-r--r--kode/kwsdl/Makefile.am2
-rw-r--r--kode/kwsdl/kung/Makefile.am2
-rw-r--r--kode/kwsdl/schema/Makefile.am2
-rw-r--r--kode/kwsdl/tests/google/Makefile.am2
-rw-r--r--kode/kwsdl/wscl/Makefile.am2
-rw-r--r--kode/kxml_compiler/Makefile.am2
-rw-r--r--konsolekalendar/Makefile.am2
-rw-r--r--kontact/src/Makefile.am2
-rw-r--r--korganizer/Makefile.am6
-rw-r--r--korganizer/korgac/Makefile.am4
-rw-r--r--korn/Makefile.am2
-rw-r--r--korn/kconf_update/Makefile.am2
-rw-r--r--kresources/featureplan/Makefile.am4
-rw-r--r--kresources/groupwise/soap/Makefile.am2
-rw-r--r--kresources/scalix/scalixadmin/Makefile.am2
-rw-r--r--kresources/slox/Makefile.am2
-rw-r--r--ktnef/gui/Makefile.am2
-rw-r--r--ktnef/tests/Makefile.am2
-rw-r--r--libemailfunctions/tests/Makefile.am4
-rw-r--r--libkcal/tests/Makefile.am28
-rw-r--r--libkdepim/cfgc/Makefile.am4
-rw-r--r--libkdepim/komposer/core/tests/Makefile.am6
-rw-r--r--libkdepim/komposer/test/Makefile.am2
-rw-r--r--libkdepim/tests/Makefile.am4
-rw-r--r--wizards/Makefile.am14
42 files changed, 74 insertions, 74 deletions
diff --git a/akregator/src/Makefile.am b/akregator/src/Makefile.am
index 45d0d964e..8506a0478 100644
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = akregator
# the application source, library search path, and link libraries
akregator_SOURCES = main.cpp mainwindow.cpp
-akregator_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am
index f86b7bc7b..2aae486ec 100644
--- a/certmanager/Makefile.am
+++ b/certmanager/Makefile.am
@@ -17,7 +17,7 @@ kleopatra_SOURCES = \
METASOURCES = AUTO
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra
diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am
index a727fa705..62630d1b2 100644
--- a/certmanager/kwatchgnupg/Makefile.am
+++ b/certmanager/kwatchgnupg/Makefile.am
@@ -13,7 +13,7 @@ kwatchgnupg_SOURCES = \
METASOURCES = AUTO
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg
diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am
index c7a413fcc..dabde6533 100644
--- a/kabc/frontend/Makefile.am
+++ b/kabc/frontend/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcfrontend
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
kabcfrontend_SOURCES = main.cpp mainWindow.ui
diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am
index f8a201cfd..7e99528cf 100644
--- a/kabc/kabc2mutt/Makefile.am
+++ b/kabc/kabc2mutt/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabc2mutt
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am
index 6de9a5c01..c5c4e685a 100644
--- a/kabc/kabcdistlistupdater/Makefile.am
+++ b/kabc/kabcdistlistupdater/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater
-kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 05cdddb09..398b2d6a5 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
diff --git a/kalarm/kalarmd/Makefile.am b/kalarm/kalarmd/Makefile.am
index 7770c6816..9dc911376 100644
--- a/kalarm/kalarmd/Makefile.am
+++ b/kalarm/kalarmd/Makefile.am
@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
noinst_LTLIBRARIES = libkalarmd.la
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libkalarmd_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
libkalarmd_la_SOURCES = alarmdaemoniface.stub alarmguiiface.stub
bin_PROGRAMS = kalarmd
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kalarmd_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
adcalendar.cpp adconfigdata.cpp clientinfo.cpp \
diff --git a/kandy/src/Makefile.am b/kandy/src/Makefile.am
index d41626331..fa8a530aa 100644
--- a/kandy/src/Makefile.am
+++ b/kandy/src/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
INCLUDES = -I$(top_srcdir) $(all_includes)
-kandy_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libkdepim/libkdepim.la
kandy_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -17,7 +17,7 @@ kandy_SOURCES = main.cpp kandy.cpp \
noinst_HEADERS = kandy.h kandyview.h modem.h atcommand.h \
commanditem.h mobilegui.h commandscheduler.h
-kandy_client_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kandy_client_LDADD = $(LIB_KDECORE)
kandy_client_SOURCES = kandy_client.cpp
diff --git a/karm/Makefile.am b/karm/Makefile.am
index a16ac1bad..353d1fb6b 100644
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkdepim/libkdepim.la $(LIBXSS) -lkdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am
index 7205a5995..8fff3ee56 100644
--- a/karm/test/Makefile.am
+++ b/karm/test/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index 429e54254..33631a6db 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
bin_PROGRAMS = kitchensync
kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kitchensync_LDADD = libkitchensync.la
xdg_apps_DATA = kitchensync.desktop
diff --git a/kmailcvt/Makefile.am b/kmailcvt/Makefile.am
index b5e48e83c..2d0d3330c 100644
--- a/kmailcvt/Makefile.am
+++ b/kmailcvt/Makefile.am
@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
kmailcvt_METASOURCES = AUTO
# the library search path.
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
KDE_ICON=AUTO
diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am
index d63a889db..a5638cd86 100644
--- a/kmobile/Makefile.am
+++ b/kmobile/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
INCLUDES = $(all_includes)
-kmobile_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
libkmobileclient_la_LIBADD = $(LIB_KDECORE) -lDCOP
EXTRA_PROGRAMS = testlibkmobile
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testlibkmobile_LDADD = libkmobileclient.la
testlibkmobile_SOURCES = testlibkmobile.cpp
diff --git a/knode/Makefile.am b/knode/Makefile.am
index 57b6481e4..38aff98ac 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -17,7 +17,7 @@ SUBDIRS = pics filters
bin_PROGRAMS = knode
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
knode_LDADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp
diff --git a/knotes/Makefile.am b/knotes/Makefile.am
index 0f3eb458f..8334d9c83 100644
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@@ -28,7 +28,7 @@ knotes_SOURCES = main.cpp knotesapp.cpp KNotesAppIface.skel
knotes_LDADD = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
-knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
knotes_COMPILE_FIRST = knoteconfig.h
kde_module_LTLIBRARIES = knotes_local.la
diff --git a/kode/Makefile.am b/kode/Makefile.am
index 393804fa3..af8e61573 100644
--- a/kode/Makefile.am
+++ b/kode/Makefile.am
@@ -14,7 +14,7 @@ libkode_la_LIBADD = -lkdecore
bin_PROGRAMS = kode
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kode_LDADD = libkode.la -lkabc
kode_SOURCES = kodemain.cpp
diff --git a/kode/kwsdl/Makefile.am b/kode/kwsdl/Makefile.am
index bc7d0d1f3..138759978 100644
--- a/kode/kwsdl/Makefile.am
+++ b/kode/kwsdl/Makefile.am
@@ -11,7 +11,7 @@ libwsdl_la_LIBADD = -lkdecore schema/libschema.la
bin_PROGRAMS = kwsdl_compiler
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kwsdl_compiler_LDADD = ../libkode.la libwsdl.la
kwsdl_compiler_SOURCES = compiler.cpp converter.cpp creator.cpp main.cpp \
namemapper.cpp
diff --git a/kode/kwsdl/kung/Makefile.am b/kode/kwsdl/kung/Makefile.am
index 1906ec1c1..f979c09dc 100644
--- a/kode/kwsdl/kung/Makefile.am
+++ b/kode/kwsdl/kung/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libkdepim $(all_includes)
bin_PROGRAMS = kung
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \
diff --git a/kode/kwsdl/schema/Makefile.am b/kode/kwsdl/schema/Makefile.am
index 9b98340f4..327c83a31 100644
--- a/kode/kwsdl/schema/Makefile.am
+++ b/kode/kwsdl/schema/Makefile.am
@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libschema_la_LIBADD = -lqt-mt -lkdecore -lkio
#bin_PROGRAMS = schematest
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#schematest_SOURCES = main.cpp
#schematest_LDADD = libschema.la
diff --git a/kode/kwsdl/tests/google/Makefile.am b/kode/kwsdl/tests/google/Makefile.am
index 171f0c5cb..62b74bc1b 100644
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
googletest_LDADD = -lkdecore -lkio
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/kode/kwsdl/wscl/Makefile.am b/kode/kwsdl/wscl/Makefile.am
index 9f02543f7..a04dd54e5 100644
--- a/kode/kwsdl/wscl/Makefile.am
+++ b/kode/kwsdl/wscl/Makefile.am
@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
libwscl_la_LIBADD = -lqt-mt
#bin_PROGRAMS = wscltest
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#wscltest_SOURCES = main.cpp
#wscltest_LDADD = libwscl.la
diff --git a/kode/kxml_compiler/Makefile.am b/kode/kxml_compiler/Makefile.am
index d42867185..97cb60fec 100644
--- a/kode/kxml_compiler/Makefile.am
+++ b/kode/kxml_compiler/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
bin_PROGRAMS = kxml_compiler
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kxml_compiler_LDADD = ../libkode.la -lkdecore
kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
diff --git a/konsolekalendar/Makefile.am b/konsolekalendar/Makefile.am
index 1fa54aa0d..51ea43bb3 100644
--- a/konsolekalendar/Makefile.am
+++ b/konsolekalendar/Makefile.am
@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
stdcalendar.cpp main.cpp
konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index b30c5bc77..1b49e279f 100644
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO
-kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kontact_LDADD = $(top_builddir)/libkdepim/libkdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index c89d8b60e..32c26bc80 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@@ -36,12 +36,12 @@ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
check_PROGRAMS = korgplugins timezone
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA)
korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index ac56f3640..844af647e 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
bin_PROGRAMS = korgac
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
korgac_LDADD = $(LIB_KDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testalarmdlg_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
diff --git a/korn/Makefile.am b/korn/Makefile.am
index 13d908dfc..7768c61b8 100644
--- a/korn/Makefile.am
+++ b/korn/Makefile.am
@@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_RTTI)
INCLUDES = -I$(top_srcdir)/libkmime \
$(all_includes)
#INCLUDES = -I$(top_srcdir)/mimelib -I$(top_srcdir)/libkmime $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO
diff --git a/korn/kconf_update/Makefile.am b/korn/kconf_update/Makefile.am
index 87b23ad85..1d85dc9f7 100644
--- a/korn/kconf_update/Makefile.am
+++ b/korn/kconf_update/Makefile.am
@@ -8,5 +8,5 @@ kconf_PROGRAMS = korn-3-4-config_change
kconfdir = $(libdir)/kconf_update_bin
korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
-korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
korn_3_4_config_change_LDADD = $(LIB_QT)
diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am
index 3d36b3f9f..3e3d01a8b 100644
--- a/kresources/featureplan/Makefile.am
+++ b/kresources/featureplan/Makefile.am
@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h
diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am
index d0793429c..638b0ba47 100644
--- a/kresources/groupwise/soap/Makefile.am
+++ b/kresources/groupwise/soap/Makefile.am
@@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
soapdebug_LDADD = libgwsoap.la -lkdecore \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkdepim/libkdepim.la
diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am
index 7402ef281..fb748a0fb 100644
--- a/kresources/scalix/scalixadmin/Makefile.am
+++ b/kresources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
INCLUDES = $(all_includes)
-scalixadmin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
scalixadmin_LDADD = $(LIB_KABC)
scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am
index 6cc95f1eb..584a2f33b 100644
--- a/kresources/slox/Makefile.am
+++ b/kresources/slox/Makefile.am
@@ -34,7 +34,7 @@ kabc_slox_la_LIBADD = libkabc_slox.la
EXTRA_PROGRAMS = testsloxaccounts
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testsloxaccounts_LDADD = libkslox.la
testsloxaccounts_SOURCES = testsloxaccounts.cpp
diff --git a/ktnef/gui/Makefile.am b/ktnef/gui/Makefile.am
index 1a9674610..144f0b244 100644
--- a/ktnef/gui/Makefile.am
+++ b/ktnef/gui/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = pics
bin_PROGRAMS = ktnef
-ktnef_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ktnef_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
ktnef_LDADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
ktnef_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \
diff --git a/ktnef/tests/Makefile.am b/ktnef/tests/Makefile.am
index a2619c0ef..103d7eb7e 100644
--- a/ktnef/tests/Makefile.am
+++ b/ktnef/tests/Makefile.am
@@ -4,7 +4,7 @@ LDADD = ../lib/libktnef.la $(LIB_KDECORE)
check_PROGRAMS = parsertest
TESTS = parsertest
-parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+parsertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
parsertest_SOURCES = parsertest.cpp
METASOURCES = AUTO
diff --git a/libemailfunctions/tests/Makefile.am b/libemailfunctions/tests/Makefile.am
index 95874de94..366725aaf 100644
--- a/libemailfunctions/tests/Makefile.am
+++ b/libemailfunctions/tests/Makefile.am
@@ -4,10 +4,10 @@ LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
check_PROGRAMS = testidmapper testemail
TESTS = testemail
-testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testidmapper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testidmapper_SOURCES = testidmapper.cpp
-testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testemail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testemail_SOURCES = testemail.cpp
METASOURCES = AUTO
diff --git a/libkcal/tests/Makefile.am b/libkcal/tests/Makefile.am
index 1a09143ef..3bdd6df89 100644
--- a/libkcal/tests/Makefile.am
+++ b/libkcal/tests/Makefile.am
@@ -25,60 +25,60 @@ check_PROGRAMS = testtostring \
METASOURCES = AUTO
testincidence_SOURCES = testincidence.cpp
-testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testincidence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testincidence_LDADD = ../libkcal.la
testcalendar_SOURCES = testcalendar.cpp
-testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testcalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testcalendar_LDADD = ../libkcal.la
testtostring_SOURCES = testtostring.cpp
-testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testtostring_LDADD = ../libkcal.la
fbrecurring_SOURCES = fbrecurring.cpp
-fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
fbrecurring_LDADD = ../libkcal.la
readandwrite_SOURCES = readandwrite.cpp
-readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
readandwrite_LDADD = ../libkcal.la
testresource_SOURCES = testresource.cpp
-testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testresource_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testresource_LDADD = ../libkcal.la
testrecurrence_SOURCES = testrecurrence.cpp
-testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testrecurrence_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testrecurrence_LDADD = ../libkcal.la
testrecurprevious_SOURCES = testrecurprevious.cpp
-testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testrecurprevious_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testrecurprevious_LDADD = ../libkcal.la
testrecurson_SOURCES = testrecurson.cpp
-testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testrecurson_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testrecurson_LDADD = ../libkcal.la
testrecurrencetype_SOURCES = testrecurrencetype.cpp
-testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testrecurrencetype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testrecurrencetype_LDADD = ../libkcal.la
testvcalexport_SOURCES = testvcalexport.cpp
-testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testvcalexport_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testvcalexport_LDADD = ../libkcal.la
testfields_SOURCES = testfields.cpp
-testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testfields_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testfields_LDADD = ../libkcal.la
testfields_CXXFLAGS= -DINPUT='"$(srcdir)/data/test_pilot.ics"'
testfb_SOURCES = testfb.cpp
-testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testfb_LDADD = ../libkcal.la
testcalselectdialog_SOURCES = testcalselectdialog.cpp
-testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testcalselectdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testcalselectdialog_LDADD = ../libkcal.la
TESTFILES = test1.ics test2.ics test3.ics test4.ics test5.ics test_Mozilla.ics
diff --git a/libkdepim/cfgc/Makefile.am b/libkdepim/cfgc/Makefile.am
index 2a3bb2727..a9643ffb3 100644
--- a/libkdepim/cfgc/Makefile.am
+++ b/libkdepim/cfgc/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir) $(all_includes)
check_PROGRAMS = example
#autoexample
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
example_LDADD = ../libkdepim.la $(LIB_KDECORE)
example_SOURCES = example.cpp exampleprefs_base.kcfgc
-#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#autoexample_LDADD = ../libkdepim.la $(LIB_KDECORE)
#autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
diff --git a/libkdepim/komposer/core/tests/Makefile.am b/libkdepim/komposer/core/tests/Makefile.am
index de3a40f90..187387f35 100644
--- a/libkdepim/komposer/core/tests/Makefile.am
+++ b/libkdepim/komposer/core/tests/Makefile.am
@@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
METASOURCES = AUTO
testfactory_SOURCES = main.cpp managertest.cpp
-testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testfactory_LDADD = ../libkomposer.la
testmanager_SOURCES = testmanager.cpp
-testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testmanager_LDADD = ../libkomposer.la
testkomposer_SOURCES = testkomposer.cpp
-testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
testkomposer_LDADD = ../libkomposer.la
check: testfactory
diff --git a/libkdepim/komposer/test/Makefile.am b/libkdepim/komposer/test/Makefile.am
index 4901deed7..bec410613 100644
--- a/libkdepim/komposer/test/Makefile.am
+++ b/libkdepim/komposer/test/Makefile.am
@@ -1,6 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
LDADD = $(LIB_KPARTS) ../core/libkomposer.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
check_PROGRAMS = test
diff --git a/libkdepim/tests/Makefile.am b/libkdepim/tests/Makefile.am
index 2e0d081ba..7775493cd 100644
--- a/libkdepim/tests/Makefile.am
+++ b/libkdepim/tests/Makefile.am
@@ -1,5 +1,5 @@
AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
LDADD = ../libkdepim.la $(LIB_KDECORE)
check_PROGRAMS = testwizard testaddresseelineedit \
@@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
METASOURCES = AUTO
-#example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#example_LDADD = ../libkdepim.la $(LIB_KDECORE)
#example_SOURCES = example.cpp exampleprefs_base.kcfgc
diff --git a/wizards/Makefile.am b/wizards/Makefile.am
index 1c953b9ff..f1aa105cd 100644
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
libscalixwizard.la
-groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \
libkolabwizard.la \
libexchangewizard.la \
@@ -39,7 +39,7 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \
kolabkmailchanges.cpp
kolabwizard_LDADD = libkolabwizard.la $(LIB_KDEUI)
-kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kolabwizard_SOURCES = kolabmain.cpp
# eGroupware
@@ -53,7 +53,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xm
$(LIB_KDEUI)
egroupwarewizard_LDADD = libegroupwarewizard.la
-egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
egroupwarewizard_SOURCES = egroupwaremain.cpp
# SLOX
@@ -64,7 +64,7 @@ libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \
$(top_builddir)/libkdepim/libkdepim.la
sloxwizard_LDADD = libsloxwizard.la
-sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
sloxwizard_SOURCES = sloxmain.cpp
# GroupWise
@@ -80,7 +80,7 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_
groupwisewizard_LDADD = libgroupwisewizard.la
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
groupwisewizard_SOURCES = groupwisemain.cpp
# Exchange
@@ -91,7 +91,7 @@ libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_new
$(top_builddir)/libkdepim/libkdepim.la
exchangewizard_LDADD = libexchangewizard.la
-exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
exchangewizard_SOURCES = exchangemain.cpp
# Scalix
@@ -106,7 +106,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg
scalixkmailchanges.cpp
scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI)
-scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
scalixwizard_SOURCES = scalixmain.cpp
noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \