From 2bf98fe80123692057a58a267f921cf014d61ef5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 10 Oct 2011 20:45:10 +0000 Subject: 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/kdemultimedia@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscd/Makefile.am | 2 +- kscd/kscdmagic/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kscd') diff --git a/kscd/Makefile.am b/kscd/Makefile.am index f0b8d50b..0eddd0db 100644 --- a/kscd/Makefile.am +++ b/kscd/Makefile.am @@ -22,7 +22,7 @@ libkcompactdisc_la_LIBADD = $(top_builddir)/kscd/libwm/libworkman.la kde_kcfg_DATA = kscd.kcfg -kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \ libkcompactdisc.la diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am index c5cc3a21..073bad0c 100644 --- a/kscd/kscdmagic/Makefile.am +++ b/kscd/kscdmagic/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c # the library search path. -kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -- cgit v1.2.1