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/kdeutils@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 17c2696111
commit d05fb8e2eb

@ -29,4 +29,4 @@ METASOURCES = AUTO
knumbertest_SOURCES = knumbertest.cpp knumbertest_SOURCES = knumbertest.cpp
knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP) knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)
knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -3,7 +3,7 @@ LDADD = $(LIB_KFILE)
bin_PROGRAMS = kcharselect bin_PROGRAMS = kcharselect
kcharselect_SOURCES = kcharselectdia.cc main.cc kcharselect_SOURCES = kcharselectdia.cc main.cc
kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kcharselect_METASOURCES = kcharselectdia.moc kcharselect_METASOURCES = kcharselectdia.moc
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/kconf_update

@ -34,7 +34,7 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# Uncomment the following two lines if you add a ui.rc file for your application to make use of # Uncomment the following two lines if you add a ui.rc file for your application to make use of
# KDE´s XML GUI builing # KDE´s XML GUI builing

@ -6,7 +6,7 @@ INCLUDES= $(all_includes)
## kdessh ## kdessh
bin_PROGRAMS = kdessh bin_PROGRAMS = kdessh
kdessh_SOURCES = kdessh.cpp sshdlg.cpp kdessh_SOURCES = kdessh.cpp sshdlg.cpp
kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kdessh_LDADD = $(LIB_KDEUI) -lkdesu kdessh_LDADD = $(LIB_KDEUI) -lkdesu
kdessh_METASOURCES = AUTO kdessh_METASOURCES = AUTO
noinst_HEADERS = sshdlg.h noinst_HEADERS = sshdlg.h

@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp
disks.cpp listview.cpp optiondialog.cpp stdoption.cpp disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
kdf_SOURCES = kdf.cpp kdf_SOURCES = kdf.cpp
kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kdf_LDADD = libkdf_common.la $(LIB_KFILE) kdf_LDADD = libkdf_common.la $(LIB_KFILE)
kwikdisk_SOURCES = kwikdisk.cpp kwikdisk_SOURCES = kwikdisk.cpp
kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE) kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE)
kde_module_LTLIBRARIES = kcm_kdf.la kde_module_LTLIBRARIES = kcm_kdf.la

@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
appsdir = $(kde_datadir)/kgpg appsdir = $(kde_datadir)/kgpg
apps_DATA = kgpg.rc listkeys.rc tips apps_DATA = kgpg.rc listkeys.rc tips

@ -20,7 +20,7 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
khexedit_METASOURCES = AUTO khexedit_METASOURCES = AUTO
khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
khexedit_LDADD = $(LIB_KIO) $(LIB_KDEPRINT) khexedit_LDADD = $(LIB_KIO) $(LIB_KDEPRINT)
xdg_apps_DATA = khexedit.desktop xdg_apps_DATA = khexedit.desktop

@ -1,5 +1,5 @@
INCLUDES = $(all_includes) 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
LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)
bin_PROGRAMS = kjots bin_PROGRAMS = kjots

@ -27,7 +27,7 @@ kcm_laptop_la_COMPILE_FIRST = crcresult.h
AM_CPPFLAGS = $(all_includes) AM_CPPFLAGS = $(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
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
bin_PROGRAMS = kregexpeditor bin_PROGRAMS = kregexpeditor
kregexpeditor_SOURCES = main.cpp kregexpeditor_SOURCES = main.cpp
kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_KIO) kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_KIO)
kregexpeditor_INCLUDES = $(all_includes) kregexpeditor_INCLUDES = $(all_includes)

@ -1,5 +1,5 @@
INCLUDES = $(all_includes) 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
LDADD = $(LIB_KDEUI) $(LIB_KFILE) LDADD = $(LIB_KDEUI) $(LIB_KFILE)
bin_PROGRAMS = ktimer bin_PROGRAMS = ktimer

@ -7,7 +7,7 @@ kwalletmanager_SOURCES = walletwidget.ui kwalletmanager.cpp \
kwalletmanager.skel main.cpp kwalletpopup.cpp \ kwalletmanager.skel main.cpp kwalletpopup.cpp \
kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \ kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
kbetterthankdialogbase.ui kbetterthankdialogbase.ui
kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kwalletmanager_LDADD = $(LIB_KIO) -lkwalletclient kwalletmanager_LDADD = $(LIB_KIO) -lkwalletclient
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\ noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\

Loading…
Cancel
Save