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 | 58827d93e4b0389a25c99e72b249e4a297d763bd (patch) | |
| tree | aed4bfdfdb0065199d773c4130eb220e63a305aa | |
| parent | d8368941307b6fe9fc54465d60c4e55774b2da96 (diff) | |
| download | ktorrent-58827d93e4b0389a25c99e72b249e4a297d763bd.tar.gz ktorrent-58827d93e4b0389a25c99e72b249e4a297d763bd.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/applications/ktorrent@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | apps/ktcachecheck/Makefile.am | 2 | ||||
| -rw-r--r-- | apps/ktorrent/Makefile.am | 2 | ||||
| -rw-r--r-- | apps/kttorinfo/Makefile.am | 2 | ||||
| -rw-r--r-- | utests/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am index 19f89d4..a840b27 100644 --- a/apps/ktcachecheck/Makefile.am +++ b/apps/ktcachecheck/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \ multicachechecker.cpp -ktcachecheck_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \ $(LIB_KFILE) $(LIB_KIO) noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am index d9b91ae..33dded8 100644 --- a/apps/ktorrent/Makefile.am +++ b/apps/ktorrent/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/ $(all_includes) # the library search path. -ktorrent_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \ diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am index 01e34c3..2be9eda 100644 --- a/apps/kttorinfo/Makefile.am +++ b/apps/kttorinfo/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = kttorinfo kttorinfo_SOURCES = main.cpp -kttorinfo_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \ $(LIB_KIO) diff --git a/utests/Makefile.am b/utests/Makefile.am index eb25f53..5d0e406 100644 --- a/utests/Makefile.am +++ b/utests/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \ upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h bin_PROGRAMS = ktutester -ktutester_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \ upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \ rc4test.cpp difflehellmantest.cpp |