From 2bf98fe80123692057a58a267f921cf014d61ef5 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 10 Oct 2011 20:45:10 +0000
Subject: 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/kdemultimedia@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 arts/builder/Makefile.am   | 2 +-
 arts/gui/kde/Makefile.am   | 4 ++--
 kaboodle/Makefile.am       | 2 +-
 kmid/Makefile.am           | 2 +-
 kscd/Makefile.am           | 2 +-
 kscd/kscdmagic/Makefile.am | 2 +-
 noatun/Makefile.am         | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am
index 3f5ce2b3..aacc5761 100644
--- a/arts/builder/Makefile.am
+++ b/arts/builder/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h
 
 METASOURCES = AUTO
 
-artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+artsbuilder_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/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am
index 5ebb3d0b..8dd89ff1 100644
--- a/arts/gui/kde/Makefile.am
+++ b/arts/gui/kde/Makefile.am
@@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
 artstestgui_SOURCES = artstestgui.cpp
 artstestgui_LDADD = -lqtmcop -lkdecore -lartsflow \
   $(top_builddir)/arts/gui/common/libartsgui_idl.la
-artstestgui_LDFLAGS	= $(all_libraries) $(KDE_RPATH)
+artstestgui_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 dbtest_SOURCES = dbtest.cpp
 dbtest_LDADD = -lqtmcop -lkdecore -lartsflow \
 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la
-dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 libartsgui_kde_la_METASOURCES = AUTO
 
diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am
index 2c7183c1..5a3b6473 100644
--- a/kaboodle/Makefile.am
+++ b/kaboodle/Makefile.am
@@ -28,7 +28,7 @@ dummy.cpp:
 CLEANFILES = dummy.cpp
 
 kaboodle_LDADD = libkaboodle_noinst.la $(libs)
-kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 bin_PROGRAMS = kaboodle
 
diff --git a/kmid/Makefile.am b/kmid/Makefile.am
index 6dd4acb7..dbcb99e5 100644
--- a/kmid/Makefile.am
+++ b/kmid/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = kmidframe.h kmidclient.h kdisptext.h \
         channelcfgdlg.h instrname.h rhythmview.h \
         songlist.h slman.h kmid_part.h
 
-kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kmid_SOURCES = main.cpp
 kmid_LDADD   = libkmidlib.la
 
diff --git a/kscd/Makefile.am b/kscd/Makefile.am
index f0b8d50b..0eddd0db 100644
--- a/kscd/Makefile.am
+++ b/kscd/Makefile.am
@@ -22,7 +22,7 @@ libkcompactdisc_la_LIBADD = $(top_builddir)/kscd/libwm/libworkman.la
 
 kde_kcfg_DATA = kscd.kcfg
 
-kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \
 	     $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \
 	     libkcompactdisc.la
diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am
index c5cc3a21..073bad0c 100644
--- a/kscd/kscdmagic/Makefile.am
+++ b/kscd/kscdmagic/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS = 	kscdmagic
 kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c
 
 # the library search path. 
-kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kscdmagic_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/noatun/Makefile.am b/noatun/Makefile.am
index 2dd06107..240c3225 100644
--- a/noatun/Makefile.am
+++ b/noatun/Makefile.am
@@ -16,7 +16,7 @@ kconfdir = $(libdir)/kconf_update_bin
 kconf_PROGRAMS = noatun20update
 
 noatun20update_SOURCES  = noatun20update.cpp
-noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 noatun20update_LDADD = $(LIB_QT)
 
 messages:
-- 
cgit v1.2.3