diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
| commit | 80f78d20c3052824bdca130c00dec33756fc4387 (patch) | |
| tree | 49db6d52ab02a6f39257c56a4b69ffb03522ebf6 /kio/misc | |
| parent | 2bbbd68fcb389173d213164e8b631293b8edf424 (diff) | |
| download | tdelibs-80f78d20c3052824bdca130c00dec33756fc4387.tar.gz tdelibs-80f78d20c3052824bdca130c00dec33756fc4387.zip | |
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
Diffstat (limited to 'kio/misc')
| -rw-r--r-- | kio/misc/Makefile.am | 4 | ||||
| -rw-r--r-- | kio/misc/kfile/Makefile.am | 2 | ||||
| -rw-r--r-- | kio/misc/ksendbugmail/Makefile.am | 2 |
3 files changed, 4 insertions, 4 deletions
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 |