From 8a5dfb29c455d1d7acdcbda03d83bb7f7ca584c4 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/kdesdk@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbabel/catalogmanager/Makefile.am | 2 +- kbabel/kbabel/Makefile.am | 2 +- kbabel/kbabeldict/Makefile.am | 2 +- kbugbuster/Makefile.am | 2 +- kcachegrind/kcachegrind/Makefile.am | 2 +- kuiviewer/Makefile.am | 2 +- kunittest/Makefile.am | 4 ++-- kunittest/example/simple/Makefile.am | 4 ++-- poxml/Makefile.am | 10 +++++----- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kbabel/catalogmanager/Makefile.am b/kbabel/catalogmanager/Makefile.am index 2d8d1836..a10801c9 100644 --- a/kbabel/catalogmanager/Makefile.am +++ b/kbabel/catalogmanager/Makefile.am @@ -34,7 +34,7 @@ catalogmanager_SOURCES = main.cpp # the libraries to link against. catalogmanager_LDADD = libcatalogmanager.la -catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) +catalogmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # 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 29c8d576..0e467463 100644 --- a/kbabel/kbabel/Makefile.am +++ b/kbabel/kbabel/Makefile.am @@ -45,7 +45,7 @@ kbabel_SOURCES = main.cpp # the libraries to link against. kbabel_LDADD = libkbabel.la -kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbabel_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # 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 3720988f..e6ae7582 100644 --- a/kbabel/kbabeldict/Makefile.am +++ b/kbabel/kbabeldict/Makefile.am @@ -32,7 +32,7 @@ kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp # the libraries to link against. kbabeldict_LDADD = libkbabeldict.la -kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbabeldict_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # these are the headers for your project noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h diff --git a/kbugbuster/Makefile.am b/kbugbuster/Makefile.am index 44b31733..dd7372dc 100644 --- a/kbugbuster/Makefile.am +++ b/kbugbuster/Makefile.am @@ -11,7 +11,7 @@ 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) +kbugbuster_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor xdg_apps_DATA = kbugbuster.desktop diff --git a/kcachegrind/kcachegrind/Makefile.am b/kcachegrind/kcachegrind/Makefile.am index 76db3d6b..5e00342d 100644 --- a/kcachegrind/kcachegrind/Makefile.am +++ b/kcachegrind/kcachegrind/Makefile.am @@ -44,7 +44,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kcachegrind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/kcachegrind rc_DATA = kcachegrindui.rc diff --git a/kuiviewer/Makefile.am b/kuiviewer/Makefile.am index e5713689..378f0e22 100644 --- a/kuiviewer/Makefile.am +++ b/kuiviewer/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer # the application source, library search path, and link libraries kuiviewer_SOURCES = main.cpp kuiviewer.cpp -kuiviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kuiviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kuiviewer_LDADD = $(LIB_KPARTS) xdg_apps_DATA =kuiviewer.desktop diff --git a/kunittest/Makefile.am b/kunittest/Makefile.am index 2e5d3d0b..d8c0161e 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) +libkunittestgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE) runnergui.lo : testerwidget.h bin_PROGRAMS = kunittestguimodrunner kunittestguimodrunner_SOURCES = guimodrunner.cpp -kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kunittestguimodrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO) noinst_HEADERS = dcopinterface.h diff --git a/kunittest/example/simple/Makefile.am b/kunittest/example/simple/Makefile.am index f35b8228..3c88d7fd 100644 --- a/kunittest/example/simple/Makefile.am +++ b/kunittest/example/simple/Makefile.am @@ -4,11 +4,11 @@ METASOURCES = AUTO check_PROGRAMS = sampletests sampletestsgui sampletests_SOURCES = main.cpp sampletest.cpp -sampletests_LDFLAGS = $(KDE_RPATH) $(all_libraries) +sampletests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor sampletests_LDADD = -lkunittest sampletestsgui_SOURCES = maingui.cpp sampletest.cpp -sampletestsgui_LDFLAGS = $(KDE_RPATH) $(all_libraries) +sampletestsgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # Normally you would write -lkunittestgui here, but since the examples # are bundled with the library source code itself we don't want to # have you install the libraries before you can compile the examples. diff --git a/poxml/Makefile.am b/poxml/Makefile.am index bef54179..49b47eee 100644 --- a/poxml/Makefile.am +++ b/poxml/Makefile.am @@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS) SUBDIRS = antlr split2po_SOURCES = split.cpp parser.cpp -split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) +split2po_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor split2po_LDADD = $(LIB_QT) xml2pot_SOURCES = xml2pot.cpp parser.cpp -xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) +xml2pot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor xml2pot_LDADD = $(LIB_QT) po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp -po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) +po2xml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT) swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp -swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) +swappo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor swappo_LDADD = antlr/src/libantlr.la $(LIB_QT) transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp -transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) +transxx_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor transxx_LDADD = antlr/src/libantlr.la $(LIB_QT) parser: -- cgit v1.2.3