From 3569ebab9f28517c432e1e59ac3815be1339086f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Aug 2012 19:38:36 +0200 Subject: Update autotools for new DSO linkage style Thanks to Francois Andriot for the patch (cherry picked from commit 730967a47c613190f42c094007fabea30f24348e) --- libk3b/Makefile.am | 2 +- libk3bdevice/Makefile.am | 2 +- plugins/audiooutput/alsa/Makefile.am | 2 +- plugins/audiooutput/arts/Makefile.am | 2 +- plugins/decoder/flac/Makefile.am | 2 +- plugins/decoder/libsndfile/Makefile.am | 2 +- plugins/decoder/musepack/Makefile.am | 2 +- plugins/decoder/ogg/Makefile.am | 2 ++ plugins/decoder/wave/Makefile.am | 2 +- plugins/encoder/external/Makefile.am | 2 +- plugins/encoder/ogg/Makefile.am | 2 +- plugins/encoder/sox/Makefile.am | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libk3b/Makefile.am b/libk3b/Makefile.am index 84efe35..165a5e5 100644 --- a/libk3b/Makefile.am +++ b/libk3b/Makefile.am @@ -16,7 +16,7 @@ libk3b_la_LIBADD = core/libk3bcore.la \ plugin/libk3bplugin.la \ tools/libk3btools.la \ jobs/libjobs.la \ - $(VIDEODVDLIB) \ + $(VIDEODVDLIB) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIBDL) -lkdefx -lDCOP \ ../libk3bdevice/libk3bdevice.la libk3b_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined diff --git a/libk3bdevice/Makefile.am b/libk3bdevice/Makefile.am index bd6aaf8..0fe9eab 100644 --- a/libk3bdevice/Makefile.am +++ b/libk3bdevice/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libk3bdevice.la -libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) +libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_KDECORE) # lib version 5 for K3b 1.0 libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined diff --git a/plugins/audiooutput/alsa/Makefile.am b/plugins/audiooutput/alsa/Makefile.am index 5cc7f06..b0fe3f3 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_KDECORE) $(LIB_QT) $(LIB_KDEUI) 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..fea73ec 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_KDECORE) $(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 bdcc4a3..732cbbf 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_KDEUI) -lFLAC++ -lFLAC $(taglib_libs) +libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDEUI) $(LIB_KDECORE) $(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 2af9911..69e88f5 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_KDEUI) -lsndfile +libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(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..a8fe2dc 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_KDECORE) $(LIB_KIO) $(LIB_KDEUI) 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..5287819 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_KDECORE) $(LIB_KDEUI) $(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 5debea1..6dd6b40 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_KDECORE) ../../../libk3b/libk3b.la +libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) $(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 a095688..1674933 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_KDECORE) +libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) 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 712adbb..bdc4b97 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_KDECORE) -logg -lvorbis -lvorbisenc +libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE) -logg -lvorbis -lvorbisenc $(LIB_QT) $(LIB_KDEUI) 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 535b1c0..cf45683 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_KDECORE) +libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT) libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) pluginsdir = $(kde_datadir)/k3b/plugins -- cgit v1.2.3