From e775ea5d1bf610d735420e4b6c898367e2c6f0cb Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 28 Oct 2011 15:59:28 +0000 Subject: Pass assitional linker flags to kdemultimedia kfile-plugins modules to satisfy new direct DSO linking requirements git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1261181 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kfile-plugins/au/Makefile.am | 2 +- kfile-plugins/avi/Makefile.am | 2 +- kfile-plugins/flac/Makefile.am | 2 +- kfile-plugins/m3u/Makefile.am | 2 +- kfile-plugins/mp3/Makefile.am | 2 +- kfile-plugins/mpc/Makefile.am | 2 +- kfile-plugins/mpeg/Makefile.am | 2 +- kfile-plugins/ogg/Makefile.am | 2 +- kfile-plugins/sid/Makefile.am | 2 +- kfile-plugins/theora/Makefile.am | 2 +- kfile-plugins/wav/Makefile.am | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kfile-plugins/au/Makefile.am b/kfile-plugins/au/Makefile.am index 4dc86f65..d6aa31d9 100644 --- a/kfile-plugins/au/Makefile.am +++ b/kfile-plugins/au/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_au.h kde_module_LTLIBRARIES = kfile_au.la kfile_au_la_SOURCES = kfile_au.cpp -kfile_au_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_au_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/avi/Makefile.am b/kfile-plugins/avi/Makefile.am index 9976e127..664e81ad 100644 --- a/kfile-plugins/avi/Makefile.am +++ b/kfile-plugins/avi/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_avi.h kde_module_LTLIBRARIES = kfile_avi.la kfile_avi_la_SOURCES = kfile_avi.cpp -kfile_avi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_avi_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/flac/Makefile.am b/kfile-plugins/flac/Makefile.am index bb3a08e3..2e218b1a 100644 --- a/kfile-plugins/flac/Makefile.am +++ b/kfile-plugins/flac/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_flac.h kde_module_LTLIBRARIES = kfile_flac.la kfile_flac_la_SOURCES = kfile_flac.cpp -kfile_flac_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN) +kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_flac_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/m3u/Makefile.am b/kfile-plugins/m3u/Makefile.am index d8dcb33a..acc4e2c3 100644 --- a/kfile-plugins/m3u/Makefile.am +++ b/kfile-plugins/m3u/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_m3u.h kde_module_LTLIBRARIES = kfile_m3u.la kfile_m3u_la_SOURCES = kfile_m3u.cpp -kfile_m3u_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_m3u_la_LIBADD = $(LIB_KSYCOCA) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mp3/Makefile.am b/kfile-plugins/mp3/Makefile.am index 91b43e73..95ce744c 100644 --- a/kfile-plugins/mp3/Makefile.am +++ b/kfile-plugins/mp3/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mp3.h kde_module_LTLIBRARIES = kfile_mp3.la kfile_mp3_la_SOURCES = kfile_mp3.cpp -kfile_mp3_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN) +kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_mp3_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mpc/Makefile.am b/kfile-plugins/mpc/Makefile.am index a2fa88d6..a72cf3d0 100644 --- a/kfile-plugins/mpc/Makefile.am +++ b/kfile-plugins/mpc/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpc.h kde_module_LTLIBRARIES = kfile_mpc.la kfile_mpc_la_SOURCES = kfile_mpc.cpp -kfile_mpc_la_LDFLAGS = $(all_libraries) $(taglib_libs) -module $(KDE_PLUGIN) +kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN) kfile_mpc_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/mpeg/Makefile.am b/kfile-plugins/mpeg/Makefile.am index 1a39ca2e..41d79e11 100644 --- a/kfile-plugins/mpeg/Makefile.am +++ b/kfile-plugins/mpeg/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpeg.h kde_module_LTLIBRARIES = kfile_mpeg.la kfile_mpeg_la_SOURCES = kfile_mpeg.cpp -kfile_mpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_mpeg_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/ogg/Makefile.am b/kfile-plugins/ogg/Makefile.am index d10bfeb9..ee4f19b7 100644 --- a/kfile-plugins/ogg/Makefile.am +++ b/kfile-plugins/ogg/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ogg.h kde_module_LTLIBRARIES = kfile_ogg.la kfile_ogg_la_SOURCES = kfile_ogg.cpp vcedit.c -kfile_ogg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/sid/Makefile.am b/kfile-plugins/sid/Makefile.am index 5a3c33e1..fbb77d51 100644 --- a/kfile-plugins/sid/Makefile.am +++ b/kfile-plugins/sid/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_sid.h kde_module_LTLIBRARIES = kfile_sid.la kfile_sid_la_SOURCES = kfile_sid.cpp -kfile_sid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_sid_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/theora/Makefile.am b/kfile-plugins/theora/Makefile.am index e2029d87..78bb27c9 100644 --- a/kfile-plugins/theora/Makefile.am +++ b/kfile-plugins/theora/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_theora.h kde_module_LTLIBRARIES = kfile_theora.la kfile_theora_la_SOURCES = kfile_theora.cpp -kfile_theora_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora # let automoc handle all of the meta source files (moc) diff --git a/kfile-plugins/wav/Makefile.am b/kfile-plugins/wav/Makefile.am index 0a533384..551c088b 100644 --- a/kfile-plugins/wav/Makefile.am +++ b/kfile-plugins/wav/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_wav.h kde_module_LTLIBRARIES = kfile_wav.la kfile_wav_la_SOURCES = kfile_wav.cpp -kfile_wav_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN) kfile_wav_la_LIBADD = $(LIB_KIO) # let automoc handle all of the meta source files (moc) -- cgit v1.2.3