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/kdebase@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

50 files changed, 55 insertions, 55 deletions

diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am
index 30959a0bf..087517bea 100644
--- a/drkonqi/Makefile.am
+++ b/drkonqi/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = LICENSE
 bin_PROGRAMS = drkonqi
 
 # Libraries:
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 LDADD  = $(LIB_KDEUI) $(LIB_KIO)
 
 # toplevel.cpp must be last in row due to X-headers being included. (--enable-final)
diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am
index fa9661236..136ac1044 100644
--- a/kappfinder/Makefile.am
+++ b/kappfinder/Makefile.am
@@ -3,12 +3,12 @@ SUBDIRS = apps
 bin_PROGRAMS = kappfinder
 kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp
 kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO)
-kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 noinst_PROGRAMS = kappfinder_install
 kappfinder_install_SOURCES = main_install.cpp common.cpp
 kappfinder_install_LDADD = $(LIB_KDEUI)
-kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 1cace79c8..65a8b3598 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman
                                         pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp
 
 libkateinterfacesprivate_la_LIBADD   = -lkatepartinterfaces
-libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h
 kateincludedir = $(includedir)/kate
diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index b47763254..4190cd718 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
 
 keditfiletype_SOURCES = keditfiletype.cpp
 keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
-keditfiletype_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am
index bfa66c696..f7c365475 100644
--- a/kcontrol/kfontinst/viewpart/Makefile.am
+++ b/kcontrol/kfontinst/viewpart/Makefile.am
@@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR
 METASOURCES = AUTO
 
 kfontview_LDADD = $(LIB_KPARTS)
-kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 bin_PROGRAMS = kfontview
 xdg_apps_DATA = kfontview.desktop
diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am
index 6653bbc27..d206a092b 100644
--- a/kdepasswd/Makefile.am
+++ b/kdepasswd/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = kcm
 
 bin_PROGRAMS = kdepasswd
 kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp
-kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdepasswd_LDADD = $(LIB_KIO)
 
 METASOURCES =  AUTO
diff --git a/kdeprint/kdeprintfax/Makefile.am b/kdeprint/kdeprintfax/Makefile.am
index c2b072049..6685031cb 100644
--- a/kdeprint/kdeprintfax/Makefile.am
+++ b/kdeprint/kdeprintfax/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes)
 bin_PROGRAMS = kdeprintfax
 kdeprintfax_SOURCES = main.cpp kdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \
 		      conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp
-kdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdeprintfax_LDADD   = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc
 kdeprintfax_METASOURCES = AUTO
 
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index def6fa938..6d1d9fac2 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
 METASOURCES = AUTO
 
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 00027506d..3b16ff479 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kdesktop/lock
 
 INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
 
 ####### Files
diff --git a/kdesu/kdesu/Makefile.am b/kdesu/kdesu/Makefile.am
index 6084fc241..4b18e7580 100644
--- a/kdesu/kdesu/Makefile.am
+++ b/kdesu/kdesu/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 ## kdesu
 bin_PROGRAMS = 	kdesu
 kdesu_SOURCES = kdesu.cpp sudlg.cpp
-kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdesu_LDADD   = $(LIB_KIO) -lkdesu
 kdesu_METASOURCES =  AUTO
 noinst_HEADERS = sudlg.h
diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am
index 35980187e..76ae1d345 100644
--- a/kdialog/Makefile.am
+++ b/kdialog/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = kdialog
 
 kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel
 kdialog_LDADD = $(LIB_KIO)
-kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am
index 6d4fed27b..6b7ba14bb 100644
--- a/kdm/kfrontend/Makefile.am
+++ b/kdm/kfrontend/Makefile.am
@@ -24,11 +24,11 @@ kdm_greet_SOURCES = \
     kdmadmindialog.cpp \
     kgreeter.cpp \
     kgapp.cpp
-kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4)
 
 krootimage_SOURCES = krootimage.cpp
-krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
 
 METASOURCES = AUTO
diff --git a/kfind/Makefile.am b/kfind/Makefile.am
index a4f53b1b7..5724043d2 100644
--- a/kfind/Makefile.am
+++ b/kfind/Makefile.am
@@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp
 kfind_LDADD   =  libkfind_common.la $(LIB_KPARTS)
 
 # the library search path.
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am
index 24c1f3740..e258ba172 100644
--- a/khelpcenter/Makefile.am
+++ b/khelpcenter/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = khc_indexbuilder
 lib_LTLIBRARIES = 
 
-khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 khc_indexbuilder_LDADD = $(LIB_KDECORE)
 khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
 
@@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \
 
 EXTRA_PROGRAMS = testmetainfo
 
-testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \
                      docentrytraverser.lo htmlsearch.lo
 testmetainfo_SOURCES = testmetainfo.cpp
diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am
index f287fa11e..04d6109c5 100644
--- a/khelpcenter/htmlsearch/Makefile.am
+++ b/khelpcenter/htmlsearch/Makefile.am
@@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/
 wrapper_SCRIPTS = meinproc_wrapper
 
 khtmlindex_SOURCES = index.cpp
-khtmlindex_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI)
 
 xpm_DATA = unchecked.xpm checked.xpm
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index f7e4ce14c..247837a6d 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA)
 
 bin_PROGRAMS = kasbar
 kasbar_SOURCES = kasbarapp.cpp
-kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kasbar_LDADD = 	libkasbar.la \
 		$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 
diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am
index b63535490..56e4269bb 100644
--- a/kicker/proxy/Makefile.am
+++ b/kicker/proxy/Makefile.am
@@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
 
 extensiondebugger_SOURCES = extensiondebugger.cpp
 extensiondebugger_LDADD = ../libkicker/libkickermain.la
-extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 messages:
 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am
index 9f0e959e1..67f346f84 100644
--- a/kioslave/about/Makefile.am
+++ b/kioslave/about/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/about
 
 INCLUDES= $(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
 
 ####### Files
 
diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am
index 6ddf78726..981556099 100644
--- a/kioslave/finger/Makefile.am
+++ b/kioslave/finger/Makefile.am
@@ -2,7 +2,7 @@
 ## Edit from Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(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
 
 ####### Files
 
diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am
index 444d037fb..6e3ac84ed 100644
--- a/kioslave/fish/Makefile.am
+++ b/kioslave/fish/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = kio_fish.la
 
 INCLUDES = $(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
 
 kio_fish_la_SOURCES = fish.cpp
 kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) 
diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am
index f2f0d97fb..e50d1c56b 100644
--- a/kioslave/mac/Makefile.am
+++ b/kioslave/mac/Makefile.am
@@ -1,7 +1,7 @@
 ## Makfile.am for kio_mac
 
 INCLUDES= $(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
 
 ####### Files
 
diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am
index 365d2f774..a0a8f20c0 100644
--- a/kioslave/man/Makefile.am
+++ b/kioslave/man/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(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
 
 EXTRA_PROGRAMS = kio_man_test man2html
 
 ####### just for testing ([email protected], 15.02.2001)
 
 kio_man_test_SOURCES = kio_man_test.cpp
-kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 ####### Files
@@ -39,7 +39,7 @@ messages:
 
 man2html_SOURCES = dummy.cpp
 man2html_LDADD = man2html_simple.o $(LIB_QT)
-man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 dummy.cpp:
 	echo > $@
diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am
index 9c03ba688..4030305c9 100644
--- a/kioslave/media/mounthelper/Makefile.am
+++ b/kioslave/media/mounthelper/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
 
 kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
 
-kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI)
 
 METASOURCES = AUTO
diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am
index 2c4fc062c..ab03da8e5 100644
--- a/kioslave/nfs/Makefile.am
+++ b/kioslave/nfs/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/man
 
 INCLUDES= $(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
 
 ####### Files
 
diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am
index 24ebc5aef..bbb661b73 100644
--- a/kioslave/sftp/Makefile.am
+++ b/kioslave/sftp/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/sftp
 
 INCLUDES = $(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
 
 ####### Files
diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am
index fb4f4713a..8705ef26c 100644
--- a/kioslave/tar/Makefile.am
+++ b/kioslave/tar/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/tar
 
 INCLUDES = $(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
 
 kde_module_LTLIBRARIES = kio_tar.la
diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am
index 2b76cc4e0..f13473ac3 100644
--- a/kioslave/thumbnail/Makefile.am
+++ b/kioslave/thumbnail/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kioslave/thumbnail
 
 INCLUDES = $(all_includes) $(EXR_FLAGS)
-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
 
 if have_xcursor
diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am
index 7aaa28a9f..cb5403728 100644
--- a/kioslave/trash/Makefile.am
+++ b/kioslave/trash/Makefile.am
@@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 bin_PROGRAMS = ktrash
 ktrash_SOURCES = ktrash.cpp
 ktrash_LDADD = $(LIB_KIO)
-ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kde_services_DATA = trash.protocol
 
diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am
index 79bdadfa2..5ba6aa592 100644
--- a/knetattach/Makefile.am
+++ b/knetattach/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= $(all_includes)
 
 bin_PROGRAMS = knetattach
 knetattach_SOURCES = knetattach.ui main.cpp
-knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 knetattach_LDADD   = $(LIB_KIO)
 METASOURCES = AUTO
 xdg_apps_DATA = knetattach.desktop
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index 3987d5944..bc7c785ae 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =
 kdeinit_LTLIBRARIES = keditbookmarks.la
 
 kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kbookmarkmerger_LDADD = $(LIB_KIO)
 
 dcop_DCOPIDLNG = true
diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am
index 5b4876384..30d476eb9 100644
--- a/konsole/konsole/Makefile.am
+++ b/konsole/konsole/Makefile.am
@@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLI
 
 # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp
 # kcmkonsole_LDADD   = $(LIB_KDEUI)
-# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \
 	TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \
diff --git a/kpager/Makefile.am b/kpager/Makefile.am
index d33d8852e..6b2421163 100644
--- a/kpager/Makefile.am
+++ b/kpager/Makefile.am
@@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \
 	kpagerIface.skel main.cpp  
 
 kpager_METASOURCES = AUTO
-kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kpager_LDADD = $(LIB_KDEUI)
 
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index d6ec8281a..9ea28111c 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -38,7 +38,7 @@ METASOURCES = AUTO
 
 KDE_ICON= AUTO
 # the library search path. 
-kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE�s XML GUI builing
diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am
index c7b5644cf..efa6393d5 100644
--- a/kreadconfig/Makefile.am
+++ b/kreadconfig/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -DQT_NO_CAST_ASCII 
 
 INCLUDES = $(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   =       $(LIB_KDECORE)
 
 bin_PROGRAMS	= kreadconfig kwriteconfig
diff --git a/kscreensaver/Makefile.am b/kscreensaver/Makefile.am
index 2823d4e17..343557c12 100644
--- a/kscreensaver/Makefile.am
+++ b/kscreensaver/Makefile.am
@@ -4,7 +4,7 @@
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST
 
 INCLUDES = $(GLINC) $(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
 
 bin_PROGRAMS = krandom.kss kblankscrn.kss
 
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am
index 19b328bc5..a06a82f93 100644
--- a/ksmserver/Makefile.am
+++ b/ksmserver/Makefile.am
@@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/kconf_update
 
 EXTRA_PROGRAMS = testsh
 testsh_SOURCES = test.cpp timed.ui
-testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
 
 messages:
diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am
index 8e8496db5..bf82ef67f 100644
--- a/ksplashml/Makefile.am
+++ b/ksplashml/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES=AUTO
 
 bin_PROGRAMS = ksplash
 ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp
-ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO)
 
 noinst_HEADERS = ksplashiface.h wndmain.h
diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am
index e3f522751..f8f111bdd 100644
--- a/ksplashml/themeengine/default/Makefile.am
+++ b/ksplashml/themeengine/default/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
 
 noinst_LTLIBRARIES = libthemedefault.la
 libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am
index 1e7790109..1d05c8776 100644
--- a/ksplashml/themeengine/simple/Makefile.am
+++ b/ksplashml/themeengine/simple/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = ksplashsimple
 ksplashsimple_SOURCES = main.cpp
-ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT)
diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am
index c627f6d3c..37120f10f 100644
--- a/ksplashml/themeengine/standard/Makefile.am
+++ b/ksplashml/themeengine/standard/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =  -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
 
 noinst_LTLIBRARIES = libthemestandard.la
 libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp
-libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashstandard.la
diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am
index e3f522751..f8f111bdd 100644
--- a/ksplashml/themeengine/unified/Makefile.am
+++ b/ksplashml/themeengine/unified/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES =  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
 
 noinst_LTLIBRARIES = libthemedefault.la
 libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
 
 kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index 01aeca492..b74a5fd1b 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS	= kstart
 kstart_SOURCES	= kstart.cpp
-kstart_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+kstart_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kstart_LDADD    = $(LIB_KDECORE)
 METASOURCES =	kstart.moc 
 
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index fd798bc61..10c6c6dd0 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -32,7 +32,7 @@ ksysguard_LDADD = \
 	ksgrd/libksgrd.la \
 	SensorDisplayLib/libsensordisplays.la \
 	$(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD)
-ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kpm_SOURCES = kpm.c
 
diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am
index 0fd20878b..7a2a1eaf3 100644
--- a/ksystraycmd/Makefile.am
+++ b/ksystraycmd/Makefile.am
@@ -10,7 +10,7 @@ METASOURCES	= ksystraycmd.moc
 noinst_HEADERS  = ksystraycmd.h
 
 ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp
-ksystraycmd_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+ksystraycmd_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 messages:
 	$(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot
diff --git a/ktip/Makefile.am b/ktip/Makefile.am
index 4ce2dd31a..6d9bd83f9 100644
--- a/ktip/Makefile.am
+++ b/ktip/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = pics
 bin_PROGRAMS = ktip
 ktip_SOURCES = ktipwindow.cpp
 ktip_LDADD = $(LIB_KDEUI)
-ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 KDE_ICON = AUTO
diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am
index d5969643c..5474c6aae 100644
--- a/kwin/clients/keramik/Makefile.am
+++ b/kwin/clients/keramik/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS            = tiles.h
 
 embedtool_SOURCES         = embedtool.cpp
 embedtool_LDADD           = $(LIB_QT)
-embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH)
+embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kde_module_LTLIBRARIES    = kwin3_keramik.la
 
diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am
index feb31c424..89b661780 100644
--- a/kwin/clients/kwmtheme/cli_installer/Makefile.am
+++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kwmtheme
 kwmtheme_SOURCES = main.cpp 
 
 # the library search path. 
-kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am
index acbf5e77d..e31c88be6 100644
--- a/kwin/killer/Makefile.am
+++ b/kwin/killer/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = kwin_killer_helper
 
 kwin_killer_helper_SOURCES = killer.cpp
 kwin_killer_helper_LDADD = $(LIB_KDEUI)
-kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am
index da92d969d..444cde9dc 100644
--- a/kwin/tools/Makefile.am
+++ b/kwin/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
 INCLUDES = $(all_includes)
 
 test_gravity_SOURCES = test_gravity.cpp
-test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 test_gravity_LDADD = $(LIB_X11)
 
 METASOURCES = AUTO
diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am
index bee1570c4..b83893e51 100644
--- a/nsplugins/test/Makefile.am
+++ b/nsplugins/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h
 
 check_PROGRAMS = testnsplugin
 testnsplugin_SOURCES = testnsplugin.cpp
-testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 testnsplugin_LDADD = $(LIB_KDEUI) ../libnsplugin.la
 
 $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h