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
v3.5.13-sru
tpearson 13 years ago
parent 227254c159
commit 8a5dfb29c4

@ -34,7 +34,7 @@ catalogmanager_SOURCES = main.cpp
# the libraries to link against. # the libraries to link against.
catalogmanager_LDADD = libcatalogmanager.la 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 # these are the headers for your project
noinst_HEADERS = catalogmanageriface.h catalogmanager.h \ noinst_HEADERS = catalogmanageriface.h catalogmanager.h \

@ -45,7 +45,7 @@ kbabel_SOURCES = main.cpp
# the libraries to link against. # the libraries to link against.
kbabel_LDADD = libkbabel.la 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 # these are the headers for your project
noinst_HEADERS = kbabel.h kbabelview.h \ noinst_HEADERS = kbabel.h kbabelview.h \

@ -32,7 +32,7 @@ kbabeldict_SOURCES = main.cpp kbabeldictview.cpp kbabeldict.cpp kbabelsplash.cpp
# the libraries to link against. # the libraries to link against.
kbabeldict_LDADD = libkbabeldict.la 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 # these are the headers for your project
noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h

@ -11,7 +11,7 @@ bin_PROGRAMS = kbugbuster
kbugbuster_SOURCES = main.cpp kbugbuster_SOURCES = main.cpp
kbugbuster_LDADD = -lkutils gui/libkbbmainwindow.la \ kbugbuster_LDADD = -lkutils gui/libkbbmainwindow.la \
backend/libkbbbackend.la $(LIB_KHTML) $(LIB_KIO) 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 xdg_apps_DATA = kbugbuster.desktop

@ -44,7 +44,7 @@ INCLUDES= $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # 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 rcdir = $(kde_datadir)/kcachegrind
rc_DATA = kcachegrindui.rc rc_DATA = kcachegrindui.rc

@ -25,7 +25,7 @@ bin_PROGRAMS = kuiviewer
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kuiviewer_SOURCES = main.cpp kuiviewer.cpp 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) kuiviewer_LDADD = $(LIB_KPARTS)
xdg_apps_DATA =kuiviewer.desktop xdg_apps_DATA =kuiviewer.desktop

@ -4,14 +4,14 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libkunittestgui.la lib_LTLIBRARIES = libkunittestgui.la
libkunittestgui_la_SOURCES = testerwidget.ui runnergui.cpp dcopinterface.skel 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) libkunittestgui_la_LIBADD = -lkunittest $(LIB_KDECORE)
runnergui.lo : testerwidget.h runnergui.lo : testerwidget.h
bin_PROGRAMS = kunittestguimodrunner bin_PROGRAMS = kunittestguimodrunner
kunittestguimodrunner_SOURCES = guimodrunner.cpp 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) kunittestguimodrunner_LDADD = libkunittestgui.la $(LIB_KDECORE) $(LIB_KIO)
noinst_HEADERS = dcopinterface.h noinst_HEADERS = dcopinterface.h

@ -4,11 +4,11 @@ METASOURCES = AUTO
check_PROGRAMS = sampletests sampletestsgui check_PROGRAMS = sampletests sampletestsgui
sampletests_SOURCES = main.cpp sampletest.cpp 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 sampletests_LDADD = -lkunittest
sampletestsgui_SOURCES = maingui.cpp sampletest.cpp 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 # Normally you would write -lkunittestgui here, but since the examples
# are bundled with the library source code itself we don't want to # are bundled with the library source code itself we don't want to
# have you install the libraries before you can compile the examples. # have you install the libraries before you can compile the examples.

@ -7,23 +7,23 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
SUBDIRS = antlr SUBDIRS = antlr
split2po_SOURCES = split.cpp parser.cpp 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) split2po_LDADD = $(LIB_QT)
xml2pot_SOURCES = xml2pot.cpp parser.cpp 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) xml2pot_LDADD = $(LIB_QT)
po2xml_SOURCES = GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp 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) po2xml_LDADD = antlr/src/libantlr.la $(LIB_QT)
swappo_SOURCES = GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp 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) swappo_LDADD = antlr/src/libantlr.la $(LIB_QT)
transxx_SOURCES = GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp 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) transxx_LDADD = antlr/src/libantlr.la $(LIB_QT)
parser: parser:

Loading…
Cancel
Save