From 80f78d20c3052824bdca130c00dec33756fc4387 Mon Sep 17 00:00:00 2001 From: tpearson 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/kdelibs@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/knotify/Makefile.am | 2 +- dcop/Makefile.am | 6 +++--- interfaces/kscript/Makefile.am | 2 +- interfaces/ktexteditor/Makefile.am | 2 +- kabc/Makefile.am | 2 +- kabc/tests/Makefile.am | 24 ++++++++++++------------ kabc/vcard/Makefile.am | 4 ++-- kabc/vcardparser/Makefile.am | 6 +++--- kdecore/kconfig_compiler/Makefile.am | 2 +- kdecore/kconfig_compiler/example/Makefile.am | 4 ++-- kdecore/kconfig_compiler/tests/Makefile.am | 20 ++++++++++---------- kded/Makefile.am | 6 +++--- kdewidgets/Makefile.am | 2 +- kio/kioexec/Makefile.am | 2 +- kio/misc/Makefile.am | 4 ++-- kio/misc/kfile/Makefile.am | 2 +- kio/misc/ksendbugmail/Makefile.am | 2 +- kio/tests/Makefile.am | 2 +- kioslave/gzip/Makefile.am | 2 +- kioslave/http/kcookiejar/tests/Makefile.am | 2 +- kioslave/metainfo/Makefile.am | 2 +- knewstuff/Makefile.am | 6 +++--- kresources/Makefile.am | 2 +- kstyles/keramik/Makefile.am | 2 +- kstyles/utils/installtheme/Makefile.am | 2 +- kunittest/Makefile.am | 2 +- pics/Makefile.am | 2 +- 27 files changed, 58 insertions(+), 58 deletions(-) diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am index fd2a9c48e..9472b5dec 100644 --- a/arts/knotify/Makefile.am +++ b/arts/knotify/Makefile.am @@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO check_PROGRAMS = knotifytest knotifytest_SOURCES = knotifytest.cpp knotifytest_LDADD = $(LIB_KDECORE) -knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) +knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = knotify.h diff --git a/dcop/Makefile.am b/dcop/Makefile.am index 223d1c00b..f6ef2a47f 100644 --- a/dcop/Makefile.am +++ b/dcop/Makefile.am @@ -50,15 +50,15 @@ dcopserver_la_LIBADD = libDCOP.la $(LIB_QT) dcopserver_shutdown_SOURCES = dcopserver_shutdown.c -testdcop_LDFLAGS = $(KDE_RPATH) $(all_libraries) +testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testdcop_SOURCES = testdcop.cpp testdcop_LDADD = libDCOP.la -dcop_deadlock_test_LDFLAGS = $(KDE_RPATH) $(all_libraries) +dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp dcop_deadlock_test_LDADD = ../kdecore/libkdecore.la -testdcopc_LDFLAGS = $(KDE_RPATH) $(all_libraries) +testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testdcopc_SOURCES = testdcopc.c dcopc.c testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM) diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am index 41cf60792..dbb2843bb 100644 --- a/interfaces/kscript/Makefile.am +++ b/interfaces/kscript/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_ #lib_LTLIBRARIES = libkscriptloader.la libkscript.la lib_LTLIBRARIES = libkscript.la #libkscriptloader_la_SOURCES = scriptloader.cpp -#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor #libkscriptloader_la_LIBADD = $(LIB_KPARTS) libkscript_la_SOURCES = scriptmanager.cpp diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am index 97ae82e2d..d2095e780 100644 --- a/interfaces/ktexteditor/Makefile.am +++ b/interfaces/ktexteditor/Makefile.am @@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \ texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp -libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI) ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ diff --git a/kabc/Makefile.am b/kabc/Makefile.am index 7ca9bd473..52b8bcb48 100644 --- a/kabc/Makefile.am +++ b/kabc/Makefile.am @@ -52,7 +52,7 @@ METASOURCES = AUTO bin_PROGRAMS = kab2kabc -kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kab2kabc_LDADD = libkabc.la ../kab/libkab.la kab2kabc_SOURCES = kab2kabc.cpp diff --git a/kabc/tests/Makefile.am b/kabc/tests/Makefile.am index 99d410a2e..12651b8f0 100644 --- a/kabc/tests/Makefile.am +++ b/kabc/tests/Makefile.am @@ -12,44 +12,44 @@ check_PROGRAMS = testlock testldapclient testlock_LDFLAGS = $(all_libraries) testlock_SOURCES = testlock.cpp -testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testldapclient_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testldapclient_SOURCES = testldapclient.cpp EXTRA_PROGRAMS = testkabc testkabcdlg testdistlist bigread bigwrite testdb \ testaddressee testaddresseelist testaddressfmt kabcargl testaddresslineedit -testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testkabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testkabc_SOURCES = testkabc.cpp -testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testaddressee_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testaddressee_SOURCES = testaddressee.cpp -testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testaddresseelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testaddresseelist_SOURCES = testaddresseelist.cpp -testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testaddressfmt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testaddressfmt_SOURCES = testaddressfmt.cpp -testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testkabcdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testkabcdlg_SOURCES = testkabcdlg.cpp -testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testdistlist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testdistlist_SOURCES = testdistlist.cpp -testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testaddresslineedit_SOURCES = testaddresslineedit.cpp -bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) +bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigread_SOURCES = bigread.cpp -bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) +bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la bigwrite_SOURCES = bigwrite.cpp -testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testdb_SOURCES = testdb.cpp -kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kabcargl_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kabcargl_SOURCES = kabcargl.cpp diff --git a/kabc/vcard/Makefile.am b/kabc/vcard/Makefile.am index 953857161..20d9b640e 100644 --- a/kabc/vcard/Makefile.am +++ b/kabc/vcard/Makefile.am @@ -12,10 +12,10 @@ libvcard_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) check_PROGRAMS = testwrite testread -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcard.la testwrite_SOURCES = testwrite.cpp -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcard.la testread_SOURCES = testread.cpp diff --git a/kabc/vcardparser/Makefile.am b/kabc/vcardparser/Makefile.am index 42e55cb4b..0b30120cd 100644 --- a/kabc/vcardparser/Makefile.am +++ b/kabc/vcardparser/Makefile.am @@ -8,15 +8,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h check_PROGRAMS = testread testwrite testread2 -testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread_SOURCES = testread.cpp -testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testread2_SOURCES = testread2.cpp testutils.cpp -testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la testwrite_SOURCES = testwrite.cpp diff --git a/kdecore/kconfig_compiler/Makefile.am b/kdecore/kconfig_compiler/Makefile.am index cfecd8408..e80f24d0e 100644 --- a/kdecore/kconfig_compiler/Makefile.am +++ b/kdecore/kconfig_compiler/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes) bin_PROGRAMS = kconfig_compiler -kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kconfig_compiler_LDADD = $(LIB_KDECORE) kconfig_compiler_SOURCES = kconfig_compiler.cpp diff --git a/kdecore/kconfig_compiler/example/Makefile.am b/kdecore/kconfig_compiler/example/Makefile.am index 730f7fcc3..4359c429e 100644 --- a/kdecore/kconfig_compiler/example/Makefile.am +++ b/kdecore/kconfig_compiler/example/Makefile.am @@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes) check_PROGRAMS = example # autoexample EXTRA_PROGRAMS = autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor example_LDADD = $(LIB_KDECORE) example_SOURCES = example.cpp exampleprefs_base.cpp -autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) +autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI) autoexample_SOURCES = exampleprefs_base.cpp general_base.ui myoptions_base.ui \ autoexample.cpp diff --git a/kdecore/kconfig_compiler/tests/Makefile.am b/kdecore/kconfig_compiler/tests/Makefile.am index cb538783c..01a510f31 100644 --- a/kdecore/kconfig_compiler/tests/Makefile.am +++ b/kdecore/kconfig_compiler/tests/Makefile.am @@ -14,43 +14,43 @@ CLEANFILES = test1.cpp test1.h \ test_dpointer.cpp test_dpointer.h \ md5sums -test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test1_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test1_LDADD = $(LIB_KDECORE) test1_SOURCES = test1main.cpp test1.cpp -test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test2_LDADD = $(LIB_KDECORE) test2_SOURCES = test2main.cpp test2.cpp -test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test3_LDADD = $(LIB_KDECORE) test3_SOURCES = test3main.cpp test3.cpp -test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test4_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test4_LDADD = $(LIB_KDECORE) test4_SOURCES = test4main.cpp test4.cpp -test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test5_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test5_LDADD = $(LIB_KDECORE) test5_SOURCES = test5main.cpp test5.cpp -test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test6_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test6_LDADD = $(LIB_KDECORE) test6_SOURCES = test6main.cpp test6.cpp -test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test7_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test7_LDADD = $(LIB_KDECORE) test7_SOURCES = test7main.cpp test7.cpp -test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test8_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test8_LDADD = $(LIB_KDECORE) test8_SOURCES = test8main.cpp test8a.cpp test8b.cpp -test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test9_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test9_LDADD = $(LIB_KDECORE) test9_SOURCES = test9main.cpp test9.cpp -test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test_dpointer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test_dpointer_LDADD = $(LIB_KDECORE) test_dpointer_SOURCES = test_dpointer_main.cpp test_dpointer.cpp diff --git a/kded/Makefile.am b/kded/Makefile.am index d8ebac458..554a0e536 100644 --- a/kded/Makefile.am +++ b/kded/Makefile.am @@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist -kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kdontchangethehostname_LDADD = $(LIB_KDECORE) kdontchangethehostname_SOURCES = khostname.cpp -kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kmimelist_LDADD = ../kio/libkio.la kmimelist_SOURCES = kmimelist.cpp -kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kde_menu_LDADD = $(LIB_KIO) kde_menu_SOURCES = kde-menu.cpp diff --git a/kdewidgets/Makefile.am b/kdewidgets/Makefile.am index 39cc94304..1242f1c90 100644 --- a/kdewidgets/Makefile.am +++ b/kdewidgets/Makefile.am @@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/kfile $(all_includes) bin_PROGRAMS = makekdewidgets makekdewidgets_SOURCES = makekdewidgets.cpp -makekdewidgets_LDFLAGS = $(KDE_RPATH) $(all_libraries) +makekdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libkdecore.la kde_widget_LTLIBRARIES = kdewidgets.la diff --git a/kio/kioexec/Makefile.am b/kio/kioexec/Makefile.am index 8de01676c..e0bd75491 100644 --- a/kio/kioexec/Makefile.am +++ b/kio/kioexec/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = $(all_includes) bin_PROGRAMS = kioexec kioexec_SOURCES = main.cpp -kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kioexec_LDADD = $(LIB_KIO) noinst_HEADERS = main.h diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am index 6dc6bcd60..203d79878 100644 --- a/kio/misc/Makefile.am +++ b/kio/misc/Makefile.am @@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop kmailservice_SOURCES = kmailservice.cpp kmailservice_LDADD = $(LIB_KDECORE) -kmailservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ktelnetservice_SOURCES = ktelnetservice.cpp ktelnetservice_LDADD = $(LIB_KDEUI) -ktelnetservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \ mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am index 94c7dada9..c02f9eb97 100644 --- a/kio/misc/kfile/Makefile.am +++ b/kio/misc/kfile/Makefile.am @@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes) bin_PROGRAMS = kfile kfile_SOURCES = fileprops.cpp -kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kfile_LDADD = $(LIB_KIO) diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am index f2bb2aebc..2a9b8f3cc 100644 --- a/kio/misc/ksendbugmail/Makefile.am +++ b/kio/misc/ksendbugmail/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail INCLUDES= -I$(srcdir)/.. $(all_includes) ksendbugmail_SOURCES = main.cpp smtp.cpp -ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) +ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksendbugmail_LDADD = ../../libkio.la METASOURCES = AUTO diff --git a/kio/tests/Makefile.am b/kio/tests/Makefile.am index 4ec6be6f3..ee81b822c 100644 --- a/kio/tests/Makefile.am +++ b/kio/tests/Makefile.am @@ -18,7 +18,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes) LDADD = $(LIB_KIO) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\ kioslavetest kdirwatchtest kshredtest speed kurifiltertest \ diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am index 193b8beb0..e8cda96ef 100644 --- a/kioslave/gzip/Makefile.am +++ b/kioslave/gzip/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/kio $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kgzipfilter.la diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am index b79dd10fb..32540d3f2 100644 --- a/kioslave/http/kcookiejar/tests/Makefile.am +++ b/kioslave/http/kcookiejar/tests/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest kcookiejartest_SOURCES = kcookiejartest.cpp kcookiejartest_LDADD = $(LIB_KIO) -kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor check-local: kcookiejartest ./kcookiejartest $(srcdir)/cookie.test diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am index e1c0b3382..dae0b9180 100644 --- a/kioslave/metainfo/Makefile.am +++ b/kioslave/metainfo/Makefile.am @@ -2,7 +2,7 @@ ## Makefile.am of kdebase/kioslave/metainfo INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_metainfo.la diff --git a/knewstuff/Makefile.am b/knewstuff/Makefile.am index 0de5aff1a..718246275 100644 --- a/knewstuff/Makefile.am +++ b/knewstuff/Makefile.am @@ -12,17 +12,17 @@ libknewstuff_la_SOURCES = engine.cpp entry.cpp downloaddialog.cpp \ bin_PROGRAMS = khotnewstuff -khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) +khotnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor khotnewstuff_LDADD = libknewstuff.la khotnewstuff_SOURCES = khotnewstuff.cpp EXTRA_PROGRAMS = testnewstuff ghns -testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testnewstuff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testnewstuff_LDADD = libknewstuff.la testnewstuff_SOURCES = testnewstuff.cpp -ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) +ghns_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ghns_LDADD = libknewstuff.la ghns_SOURCES = ghns.cpp diff --git a/kresources/Makefile.am b/kresources/Makefile.am index 147dd972e..18fccb095 100644 --- a/kresources/Makefile.am +++ b/kresources/Makefile.am @@ -37,7 +37,7 @@ kcm_kresources_la_LIBADD = libkresources.la $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE check_PROGRAMS = testresources -testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testresources_LDADD = libkresources.la testresources_SOURCES = testresources.cpp diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am index 39482a8e0..00132f4d1 100644 --- a/kstyles/keramik/Makefile.am +++ b/kstyles/keramik/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed genembed_SOURCES = genembed.cpp genembed_LDADD = ../../kdefx/libkdefx.la -genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) +genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\ pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\ diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am index a07905013..52073666f 100644 --- a/kstyles/utils/installtheme/Makefile.am +++ b/kstyles/utils/installtheme/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme kinstalltheme_SOURCES = main.cpp # the library search path. -kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am index 09ab8cb90..c4e89049a 100644 --- a/kunittest/Makefile.am +++ b/kunittest/Makefile.am @@ -10,7 +10,7 @@ libkunittestinclude_HEADERS = runner.h tester.h module.h libkunittestincludedir = $(includedir)/kunittest bin_PROGRAMS = kunittestmodrunner -kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kunittestmodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kunittestmodrunner_LDADD = libkunittest.la $(LIB_KDECORE) kunittestmodrunner_SOURCES = modrunner.cpp diff --git a/pics/Makefile.am b/pics/Makefile.am index 9df672d94..3a7e3d990 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = $(KSVGTOPNG) ksvgtopng_SOURCES = ksvgtopng.cpp ksvgtopng_LDADD = $(LIB_KDECORE) $(top_builddir)/kdecore/svgicons/libkdesvgicons.la -ksvgtopng_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ksvgtopng_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor install-data-local: -rm -f $(DESTDIR)$(kde_icondir)/default.kde -- cgit v1.2.1