Update autotools for new DSO linkage style

Thanks to Francois Andriot for the patch
(cherry picked from commit 730967a47c)
v3.5.13-sru
Slávek Banko 12 years ago
parent 47d1d00b2c
commit 3569ebab9f

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save