[Uml-devel] branches/trinity/kdesdk

[Timothy Pearson]

SVN commit 1258656 by tpearson:

Fix kdesdk FTBFS under oneiric


 M  +2 -2      kbabel/catalogmanager/Makefile.am  
 M  +2 -2      kbabel/kbabel/Makefile.am  
 M  +3 -3      kbabel/kbabeldict/Makefile.am  
 M  +2 -2      kbugbuster/Makefile.am  
 M  +1 -1      kioslave/svn/svnhelper/Makefile.am  
 M  +4 -4      kmtrace/Makefile.am  
 M  +1 -1      kompare/Makefile.am  
 M  +2 -2      kunittest/Makefile.am  
 M  +1 -1      umbrello/umbrello/docgenerators/Makefile.am  


--- branches/trinity/kdesdk/kbabel/catalogmanager/Makefile.am #1258655:1258656
@@ -27,14 +27,14 @@
 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 \
--- branches/trinity/kdesdk/kbabel/kbabel/Makefile.am #1258655:1258656
@@ -38,14 +38,14 @@
 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 \
--- branches/trinity/kdesdk/kbabel/kbabeldict/Makefile.am #1258655:1258656
@@ -19,19 +19,19 @@
 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
--- branches/trinity/kdesdk/kbugbuster/Makefile.am #1258655:1258656
@@ -10,8 +10,8 @@
 
 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
 
--- branches/trinity/kdesdk/kioslave/svn/svnhelper/Makefile.am #1258655:1258656
@@ -5,7 +5,7 @@
 
 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
--- branches/trinity/kdesdk/kmtrace/Makefile.am #1258655:1258656
@@ -23,13 +23,13 @@
 
 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 @@
 	$(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)
 
--- branches/trinity/kdesdk/kompare/Makefile.am #1258655:1258656
@@ -26,7 +26,7 @@
 
 # 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 \
--- branches/trinity/kdesdk/kunittest/Makefile.am #1258655:1258656
@@ -4,14 +4,14 @@
 
 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
--- branches/trinity/kdesdk/umbrello/umbrello/docgenerators/Makefile.am #1258655:1258656
@@ -2,7 +2,7 @@
 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)