From abd26b8d5eb40793252142f4c7522adb8a0174a3 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: [PATCH] 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/kdetoys@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 amor/Makefile.am        | 2 +-
 kodo/Makefile.am        | 2 +-
 kteatime/Makefile.am    | 2 +-
 ktux/Makefile.am        | 2 +-
 kweather/Makefile.am    | 2 +-
 kworldwatch/Makefile.am | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/amor/Makefile.am b/amor/Makefile.am
index 413c24e..8740364 100644
--- a/amor/Makefile.am
+++ b/amor/Makefile.am
@@ -15,7 +15,7 @@ amor_SOURCES	= amordialog.cpp amor.cpp amorwidget.cpp main.cpp amoranim.cpp amor
 include_HEADERS = AmorIface.h
 
 # the library search path
-amor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+amor_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/kodo/Makefile.am b/kodo/Makefile.am
index 38bfbd5..cf945fe 100644
--- a/kodo/Makefile.am
+++ b/kodo/Makefile.am
@@ -7,7 +7,7 @@ kodo_SOURCES = main.cpp kodometer.cpp kimagenumber.cpp
 METASOURCES = AUTO
 
 # the library search path.
-kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kodo_LDADD   = $(LIB_KDEUI)
 
 messages:
diff --git a/kteatime/Makefile.am b/kteatime/Makefile.am
index 82ebf40..623824f 100644
--- a/kteatime/Makefile.am
+++ b/kteatime/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = kteatime
 kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
 
 kteatime_METASOURCES = AUTO
-kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # LIB_KIO needed for KNotifyDialog
 kteatime_LDADD = $(LIB_KDEUI) $(LIB_KIO)
diff --git a/ktux/Makefile.am b/ktux/Makefile.am
index 8a32552..65ec913 100644
--- a/ktux/Makefile.am
+++ b/ktux/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = ktux
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 ktux_LDADD   = $(LIB_KDEUI) -lkscreensaver
diff --git a/kweather/Makefile.am b/kweather/Makefile.am
index 4db22b5..d7d31a3 100644
--- a/kweather/Makefile.am
+++ b/kweather/Makefile.am
@@ -55,7 +55,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_KDEUI)
 #globaladddir   = $(kde_datadir)/konqsidebartng/add
 #globaladd_DATA = weatherbar_add.desktop
 
-kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kweatherservice_LDADD = $(LIB_KIO)
 kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
                           weatherservice.cpp weatherservice.skel \
diff --git a/kworldwatch/Makefile.am b/kworldwatch/Makefile.am
index 75901df..c6f6de8 100644
--- a/kworldwatch/Makefile.am
+++ b/kworldwatch/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 
 kworldclock_SOURCES = main.cpp 
 kworldclock_LDADD = libww.la $(LIB_KDEUI)
-kworldclock_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 xdg_apps_DATA= kworldclock.desktop