Update autotools for new DSO linkage style

Thanks to Francois Andriot for the patch

10 files changed, 11 insertions, 9 deletions

diff --git a/plugins/audiooutput/alsa/Makefile.am b/plugins/audiooutput/alsa/Makefile.am
index 5cc7f06..72d6c1d 100644
--- a/plugins/audiooutput/alsa/Makefile.am
+++ b/plugins/audiooutput/alsa/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libk3balsaoutputplugin.la
 libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp
 
 libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS)
-libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS)
+libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUI)
 libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/audiooutput/arts/Makefile.am b/plugins/audiooutput/arts/Makefile.am
index 6d5adf5..94c93a0 100644
--- a/plugins/audiooutput/arts/Makefile.am
+++ b/plugins/audiooutput/arts/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bartsoutputplugin.la
 
 libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp
 
-libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc
+libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_TDECORE) $(LIB_QT)
 libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/flac/Makefile.am b/plugins/decoder/flac/Makefile.am
index dd9b3b8..4efcaea 100644
--- a/plugins/decoder/flac/Makefile.am
+++ b/plugins/decoder/flac/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bflacdecoder.la
 
 libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
 
-libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lFLAC++ -lFLAC $(taglib_libs) 
+libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs)
 libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/libsndfile/Makefile.am b/plugins/decoder/libsndfile/Makefile.am
index fec858f..7c879c1 100644
--- a/plugins/decoder/libsndfile/Makefile.am
+++ b/plugins/decoder/libsndfile/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3blibsndfiledecoder.la
 
 libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
 
-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lsndfile
+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lsndfile
 libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/musepack/Makefile.am b/plugins/decoder/musepack/Makefile.am
index beb7d63..f806ac5 100644
--- a/plugins/decoder/musepack/Makefile.am
+++ b/plugins/decoder/musepack/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libk3bmpcdecoder.la
 
 libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
 
-libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS)
+libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
 libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/ogg/Makefile.am b/plugins/decoder/ogg/Makefile.am
index 6705be2..93efec4 100644
--- a/plugins/decoder/ogg/Makefile.am
+++ b/plugins/decoder/ogg/Makefile.am
@@ -5,6 +5,8 @@ kde_module_LTLIBRARIES = libk3boggvorbisdecoder.la
 libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
 
 libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile 
+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+
 libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/wave/Makefile.am b/plugins/decoder/wave/Makefile.am
index d35927c..273a779 100644
--- a/plugins/decoder/wave/Makefile.am
+++ b/plugins/decoder/wave/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bwavedecoder.la
 
 libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
 
-libk3bwavedecoder_la_LIBADD = $(LIB_TDECORE) ../../../libk3b/libk3b.la
+libk3bwavedecoder_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la
 libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/external/Makefile.am b/plugins/encoder/external/Makefile.am
index c463c21..0b3d084 100644
--- a/plugins/encoder/external/Makefile.am
+++ b/plugins/encoder/external/Makefile.am
@@ -6,7 +6,7 @@ libk3bexternalencoder_la_SOURCES = base_k3bexternalencoderconfigwidget.ui \
 	base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
 	k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
 
-libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE)
+libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUI)
 libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/ogg/Makefile.am b/plugins/encoder/ogg/Makefile.am
index 0b18edc..b642baa 100644
--- a/plugins/encoder/ogg/Makefile.am
+++ b/plugins/encoder/ogg/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3boggvorbisencoder.la
 
 libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui k3boggvorbisencoder.cpp
 
-libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -logg -lvorbis -lvorbisenc
+libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_TDEUI)
 libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/encoder/sox/Makefile.am b/plugins/encoder/sox/Makefile.am
index 383b750..c7dbf90 100644
--- a/plugins/encoder/sox/Makefile.am
+++ b/plugins/encoder/sox/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3bsoxencoder.la
 
 libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui k3bsoxencoder.cpp
 
-libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE)
+libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_QT)
 libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins