From 76e1423b45cad04dc90d1043af4ca0923ebd3d4c Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 12 Oct 2011 18:10:17 +0000
Subject: Fix kdesdk FTBFS under oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1258656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kbabel/catalogmanager/Makefile.am           | 4 ++--
 kbabel/kbabel/Makefile.am                   | 4 ++--
 kbabel/kbabeldict/Makefile.am               | 6 +++---
 kbugbuster/Makefile.am                      | 4 ++--
 kioslave/svn/svnhelper/Makefile.am          | 2 +-
 kmtrace/Makefile.am                         | 8 ++++----
 kompare/Makefile.am                         | 2 +-
 kunittest/Makefile.am                       | 4 ++--
 umbrello/umbrello/docgenerators/Makefile.am | 2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am
index a10801c9..8a4e0ff1 100644
--- a/kbabel/catalogmanager/Makefile.am
+++ b/kbabel/catalogmanager/Makefile.am
@@ -27,14 +27,14 @@ libcatalogmanager_la_SOURCES =	catalogmanageriface.skel \
 libcatalogmanager_la_LIBADD =  ../commonui/libkbabelcommonui.la \
 ../kbabeldict/libkbabeldict.la ./libcvs/libcatalogmanagercvs.la \
 ./libsvn/libcatalogmanagersvn.la $(LIB_KIO)
-libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined
+libcatalogmanager_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 catalogmanager_SOURCES = main.cpp
 
 # the libraries to link against.
 catalogmanager_LDADD   = libcatalogmanager.la
-catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = catalogmanageriface.h catalogmanager.h \
diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am
index 0e467463..1e3e277f 100644
--- a/kbabel/kbabel/Makefile.am
+++ b/kbabel/kbabel/Makefile.am
@@ -38,14 +38,14 @@ libkbabel_la_SOURCES =	kbbookmarkhandler.cpp \
 kde_kcfg_DATA=kbabel.kcfg
 
 libkbabel_la_LIBADD =  ../commonui/libkbabelcommonui.la ../kbabeldict/libkbabeldict.la $(LIB_KIO) $(LIB_KSPELL)
-libkbabel_la_LDFLAGS = $(all_libraries)
+libkbabel_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 
 kbabel_SOURCES = main.cpp
 
 # the libraries to link against.
 kbabel_LDADD   = libkbabel.la
-kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # these are the headers for your project
 noinst_HEADERS   = kbabel.h kbabelview.h \
diff --git a/kbabel/kbabeldict/Makefile.am b/kbabel/kbabeldict/Makefile.am
index e6ae7582..6eb129bb 100644
--- a/kbabel/kbabeldict/Makefile.am
+++ b/kbabel/kbabeldict/Makefile.am
@@ -19,19 +19,19 @@ INCLUDES         = -I$(srcdir)/../common -I$(top_builddir)/kbabel/common $(all_i
 lib_LTLIBRARIES = libkbabeldictplugin.la
 libkbabeldictplugin_la_SOURCES = searchengine.cpp 
 libkbabeldictplugin_la_LIBADD =  $(LIB_KDECORE)
-libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries)
+libkbabeldictplugin_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 libkbabeldict_la_SOURCES = kbabeldictbox.cpp \
             kbabeldictiface.skel dictionarymenu.cpp dictchooser.cpp \
             aboutmoduledlg.cpp 
 libkbabeldict_la_LIBADD =  ../common/libkbabelcommon.la libkbabeldictplugin.la $(LIB_KDEUI)
-libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined
+libkbabeldict_la_LDFLAGS = $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
 
 # the libraries to link against.
-kbabeldict_LDADD   = libkbabeldict.la
+kbabeldict_LDADD   = libkbabeldict.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # these are the headers for your project
diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am
index dd7372dc..70fc1a23 100644
--- a/kbugbuster/Makefile.am
+++ b/kbugbuster/Makefile.am
@@ -10,8 +10,8 @@ bin_PROGRAMS = kbugbuster
 
 kbugbuster_SOURCES = main.cpp
 kbugbuster_LDADD   = -lkutils gui/libkbbmainwindow.la \
-                     backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) 
-kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+                     backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) -lkdefx $(LIB_KUTILS)
+kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
 
 xdg_apps_DATA = kbugbuster.desktop
 
diff --git a/kioslave/svn/svnhelper/Makefile.am b/kioslave/svn/svnhelper/Makefile.am
index bb5afe46..077177ca 100644
--- a/kioslave/svn/svnhelper/Makefile.am
+++ b/kioslave/svn/svnhelper/Makefile.am
@@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries)
 
 kio_svn_helper_SOURCES = kio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui subversionlog.ui subversiondiff.ui
 
-kio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries)
+kio_svn_helper_LDFLAGS = $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KIO) $(all_libraries)
 
 servicemenudir = \
     $(kde_datadir)/konqueror/servicemenus
diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am
index ab01138e..f887d049 100644
--- a/kmtrace/Makefile.am
+++ b/kmtrace/Makefile.am
@@ -23,13 +23,13 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = kmtrace demangle kmmatch
 kmtrace_SOURCES = kmtrace.cpp
-kmtrace_LDFLAGS = $(all_libraries)
+kmtrace_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 demangle_SOURCES = demangle.cpp
-demangle_LDFLAGS = $(all_libraries)
+demangle_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kmmatch_SOURCES = match.cpp
-kmmatch_LDFLAGS = $(all_libraries)
+kmmatch_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 bin_SCRIPTS = kminspector
 
@@ -42,7 +42,7 @@ ktrace_s.c: $(srcdir)/ktrace.c
 	$(LN_S) $(srcdir)/ktrace.c $@
 
 kmtracelib_LTLIBRARIES = libktrace.la
-libktrace_la_LDFLAGS = -avoid-version
+libktrace_la_LDFLAGS = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -avoid-version
 libktrace_la_SOURCES = ksotrace.cpp ktrace.c
 libktrace_la_LIBADD = $(LIBDL)
 
diff --git a/kompare/Makefile.am b/kompare/Makefile.am
index bf5297b5..5aa2a899 100644
--- a/kompare/Makefile.am
+++ b/kompare/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS = kompare
 
 # the application source, library search path, and link libraries
 kompare_SOURCES = main.cpp kompare_shell.cpp kompareurldialog.cpp
-kompare_LDFLAGS = $(all_libraries)
+kompare_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kompare_LDADD   = $(LIB_KPARTS) \
 	$(top_builddir)/kompare/interfaces/libkompareinterface.la \
 	$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am
index d8c0161e..ff868d07 100644
--- a/kunittest/Makefile.am
+++ b/kunittest/Makefile.am
@@ -4,14 +4,14 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = libkunittestgui.la
 libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel
-libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkunittest
 libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE)
 
 runnergui.lo : testerwidget.h
 
 bin_PROGRAMS = kunittestguimodrunner
 kunittestguimodrunner_SOURCES = guimodrunner.cpp
-kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lkunittest
 kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO)
 
 noinst_HEADERS = dcopinterface.h
diff --git a/umbrello/umbrello/docgenerators/Makefile.am b/umbrello/umbrello/docgenerators/Makefile.am
index 47087c4c..a98f1d7e 100644
--- a/umbrello/umbrello/docgenerators/Makefile.am
+++ b/umbrello/umbrello/docgenerators/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbr
 METASOURCES = AUTO
 bin_PROGRAMS = umbodoc
 
-AM_LDFLAGS = $(all_libraries)
+AM_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 umbodoc_COMPILE_FIRST = version.h
 umbodoc_SOURCES = main.cpp
 umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
-- 
cgit v1.2.3