From 470373d06e87afca8cb54bcbe3c95afcc8b60598 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/kdevelop@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdevdesigner/src/Makefile.am | 2 +-
 src/Makefile.am              | 4 ++--
 src/kconf_update/Makefile.am | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am
index f6e1b854..ce127aca 100644
--- a/kdevdesigner/src/Makefile.am
+++ b/kdevdesigner/src/Makefile.am
@@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner
 
 # the application source, library search path, and link libraries
 kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp
-kdevdesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdevdesigner_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/src/Makefile.am b/src/Makefile.am
index 88e7326d..900b711a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = kdevelop kdevassistant
 kdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui
 
 kdevelop_METASOURCES = AUTO
-kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdevelop_LDADD = libkdevshell.la
 
 rcdir = $(kde_datadir)/kdevelop
@@ -35,7 +35,7 @@ kdevelopdatadir = $(kde_confdir)
 kdevelopdata_DATA = kdeveloprc kdevassistantrc
 
 SUBDIRS = profiles profileengine newui kconf_update
-kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp
 kdevassistant_LDADD = libkdevshell.la
 
diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am
index b31e578c..c79b0784 100644
--- a/src/kconf_update/Makefile.am
+++ b/src/kconf_update/Makefile.am
@@ -11,7 +11,7 @@ kconf_PROGRAMS = kdev-gen-settings-kconf_update
 kconfdir = $(libdir)/kconf_update_bin
 
 kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp
-kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdev_gen_settings_kconf_update_LDADD   = $(LIB_QT)
 
 # vim: set noet:
-- 
cgit v1.2.1