From 442a3ecae665f818b237c99a245f4083db181e35 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 10 Oct 2011 20:45:10 +0000 Subject: [PATCH] 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/amarok@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- amarok/src/loader/Makefile.am | 2 +- amarok/src/mediadevice/daap/daapreader/Makefile.am | 2 +- .../src/mediadevice/daap/daapreader/authentication/Makefile.am | 2 +- amarok/src/scripts/graphequalizer/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amarok/src/loader/Makefile.am b/amarok/src/loader/Makefile.am index 6c54ee03..d357c686 100644 --- a/amarok/src/loader/Makefile.am +++ b/amarok/src/loader/Makefile.am @@ -10,7 +10,7 @@ amarok_LDADD = \ $(LIB_QT) \ $(LIB_KDEUI) -amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) +amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/amarok/src/mediadevice/daap/daapreader/Makefile.am b/amarok/src/mediadevice/daap/daapreader/Makefile.am index 061ef940..eab0624d 100644 --- a/amarok/src/mediadevice/daap/daapreader/Makefile.am +++ b/amarok/src/mediadevice/daap/daapreader/Makefile.am @@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \ $(LIB_KDEUI) \ $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la -libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am index 425c1951..e5ff6da2 100644 --- a/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am +++ b/amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am @@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \ $(LIB_KDECORE) \ $(LIB_KDEUI) -libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/amarok/src/scripts/graphequalizer/Makefile.am b/amarok/src/scripts/graphequalizer/Makefile.am index 8b2acb43..d84eed7d 100644 --- a/amarok/src/scripts/graphequalizer/Makefile.am +++ b/amarok/src/scripts/graphequalizer/Makefile.am @@ -21,7 +21,7 @@ graphequalizer_LDADD = \ $(LIB_KDEUI) \ $(LIB_KDECORE) -graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) +graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO