From 042dc76a36d755237893cc95628cf137b4f76543 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/kdewebdev@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kommander/editor/Makefile.am        | 2 +-
 kommander/executor/Makefile.am      | 2 +-
 kommander/pluginmanager/Makefile.am | 2 +-
 kommander/widgets/Makefile.am       | 2 +-
 kxsldbg/Makefile.am                 | 2 +-
 quanta/src/Makefile.am              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am
index aad9e81d..7a059e14 100644
--- a/kommander/editor/Makefile.am
+++ b/kommander/editor/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kmdr-editor
 AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes)
 
 # the library search path.
-kmdr_editor_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \
diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am
index 7d9004fe..dc50f7c2 100644
--- a/kommander/executor/Makefile.am
+++ b/kommander/executor/Makefile.am
@@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets
 METASOURCES = AUTO
 
 # the library search path.
-kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS =  dcopkommanderif.h
diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am
index 5b3e56c8..59041582 100644
--- a/kommander/pluginmanager/Makefile.am
+++ b/kommander/pluginmanager/Makefile.am
@@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS = mainwindow.h pluginmanager.h
diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am
index 51b23251..179db6e8 100644
--- a/kommander/widgets/Makefile.am
+++ b/kommander/widgets/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la
 INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes)
 
 # the library search path.
-#widgets_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
 
 # the libraries to link against.
diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am
index e70c4127..2515a27b 100644
--- a/kxsldbg/Makefile.am
+++ b/kxsldbg/Makefile.am
@@ -50,7 +50,7 @@ INCLUDES= $(LIBXML_CFLAGS)  $(LIBXSLT_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 
 # the application source, library search path, and link libraries
-kxsldbg_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # this is where the shell's XML-GUI resource file goes
 shellrcdir   = $(kde_datadir)/kxsldbg
diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am
index 5b8a47d9..667bb89f 100644
--- a/quanta/src/Makefile.am
+++ b/quanta/src/Makefile.am
@@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
 quanta_METASOURCES = AUTO
 
 # the library search path.
-quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # this is where the kdelnk file will go
 xdg_apps_DATA = quanta.desktop