summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
commit470373d06e87afca8cb54bcbe3c95afcc8b60598 (patch)
tree57979ee8e333b65b648bffece5c8deb8d8ed6709 /src
parent39f1ae114d5b5122527fbfc321d8087c474e02de (diff)
downloadtdevelop-470373d06e87afca8cb54bcbe3c95afcc8b60598.tar.gz
tdevelop-470373d06e87afca8cb54bcbe3c95afcc8b60598.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/kconf_update/Makefile.am2
2 files changed, 3 insertions, 3 deletions
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: