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

12 files changed, 13 insertions, 13 deletions

diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am
index 73b0600..3005a8d 100644
--- a/kcalc/knumber/tests/Makefile.am
+++ b/kcalc/knumber/tests/Makefile.am
@@ -29,4 +29,4 @@ METASOURCES = AUTO
 
 knumbertest_SOURCES = knumbertest.cpp
 knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)
-knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am
index 622920e..ef1ab5d 100644
--- a/kcharselect/Makefile.am
+++ b/kcharselect/Makefile.am
@@ -3,7 +3,7 @@ LDADD	= $(LIB_KFILE)
 bin_PROGRAMS = kcharselect
 
 kcharselect_SOURCES = kcharselectdia.cc main.cc
-kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kcharselect_METASOURCES = kcharselectdia.moc
 
 updatedir = $(kde_datadir)/kconf_update
diff --git a/kdelirc/kdelirc/Makefile.am b/kdelirc/kdelirc/Makefile.am
index ccbe9e4..1c65118 100644
--- a/kdelirc/kdelirc/Makefile.am
+++ b/kdelirc/kdelirc/Makefile.am
@@ -34,7 +34,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libkdelirc_la_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/kdessh/Makefile.am b/kdessh/Makefile.am
index 987bcd7..184bb86 100644
--- a/kdessh/Makefile.am
+++ b/kdessh/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= $(all_includes)
 ## kdessh
 bin_PROGRAMS = 	kdessh
 kdessh_SOURCES = kdessh.cpp sshdlg.cpp
-kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdessh_LDADD   = $(LIB_KDEUI) -lkdesu
 kdessh_METASOURCES =  AUTO
 noinst_HEADERS = sshdlg.h
diff --git a/kdf/Makefile.am b/kdf/Makefile.am
index b9a81ad..d524942 100644
--- a/kdf/Makefile.am
+++ b/kdf/Makefile.am
@@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp
 	disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
 
 kdf_SOURCES = kdf.cpp 
-kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdf_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kwikdisk_SOURCES = kwikdisk.cpp 
-kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kde_module_LTLIBRARIES = kcm_kdf.la
diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am
index 6435b10..0753c31 100644
--- a/kgpg/Makefile.am
+++ b/kgpg/Makefile.am
@@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg
 METASOURCES = AUTO
 
 # the library search path.
-kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 appsdir = $(kde_datadir)/kgpg
 apps_DATA = kgpg.rc listkeys.rc tips
diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am
index bacaa75..47f3e60 100644
--- a/khexedit/Makefile.am
+++ b/khexedit/Makefile.am
@@ -20,7 +20,7 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
 exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
 
 khexedit_METASOURCES = AUTO
-khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 khexedit_LDADD = $(LIB_KIO) $(LIB_KDEPRINT)
 
 xdg_apps_DATA = khexedit.desktop
diff --git a/kjots/Makefile.am b/kjots/Makefile.am
index 32af728..0389a69 100644
--- a/kjots/Makefile.am
+++ b/kjots/Makefile.am
@@ -1,5 +1,5 @@
 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_KFILE) $(LIB_KDEPRINT)
 
 bin_PROGRAMS = kjots
diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am
index a70a155..404a069 100644
--- a/klaptopdaemon/Makefile.am
+++ b/klaptopdaemon/Makefile.am
@@ -27,7 +27,7 @@ kcm_laptop_la_COMPILE_FIRST = crcresult.h
 
 AM_CPPFLAGS = $(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
 
 KDE_OPTIONS = nofinal
 
diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am
index 6f8a4e4..9a12b31 100644
--- a/kregexpeditor/Makefile.am
+++ b/kregexpeditor/Makefile.am
@@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
 
 bin_PROGRAMS = kregexpeditor
 kregexpeditor_SOURCES = main.cpp
-kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_KIO)
 kregexpeditor_INCLUDES =  $(all_includes)
 
diff --git a/ktimer/Makefile.am b/ktimer/Makefile.am
index 35d6283..bad9286 100644
--- a/ktimer/Makefile.am
+++ b/ktimer/Makefile.am
@@ -1,5 +1,5 @@
 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_KDEUI) $(LIB_KFILE)
 
 bin_PROGRAMS = ktimer
diff --git a/kwallet/Makefile.am b/kwallet/Makefile.am
index 5c5fe28..7324ef2 100644
--- a/kwallet/Makefile.am
+++ b/kwallet/Makefile.am
@@ -7,7 +7,7 @@ kwalletmanager_SOURCES = walletwidget.ui kwalletmanager.cpp \
 			kwalletmanager.skel main.cpp kwalletpopup.cpp \
 			kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
 			kbetterthankdialogbase.ui
-kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kwalletmanager_LDADD   = $(LIB_KIO) -lkwalletclient
 METASOURCES = AUTO
 noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\