diff --git a/libk3b/Makefile.am b/libk3b/Makefile.am index 9ad5173..cb31c94 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) $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) $(LIBDL) -ltdefx -lDCOP \ + $(VIDEODVDLIB) $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIBDL) -ltdefx -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 912b980..877e240 100644 --- a/libk3bdevice/Makefile.am +++ b/libk3bdevice/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libk3bdevice.la -libk3bdevice_la_LIBADD = $(LIB_TDEIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_TDECORE) +libk3bdevice_la_LIBADD = $(LIB_TDEIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_TQT) $(LIB_TDECORE) # 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 72d6c1d..9cd7c03 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) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUI) +libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS) $(LIB_TDECORE) $(LIB_TQT) $(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 4577022..9197630 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 $(LIB_TDECORE) $(LIB_QT) +libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc $(LIB_TDECORE) $(LIB_TQT) 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 4efcaea..36ed8ef 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 ../../../libk3bdevice/libk3bdevice.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lFLAC++ -lFLAC $(taglib_libs) +libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -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 4148beb..b01e30f 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 ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -lsndfile +libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -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 63a3f74..b412ee6 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 ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) +libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(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 c1f6137..e76fc5d 100644 --- a/plugins/decoder/ogg/Makefile.am +++ b/plugins/decoder/ogg/Makefile.am @@ -5,7 +5,7 @@ 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_TDEIO) +libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) diff --git a/plugins/decoder/wave/Makefile.am b/plugins/decoder/wave/Makefile.am index 273a779..61aa8d6 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) $(LIB_QT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la +libk3bwavedecoder_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) ../../../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 0b3d084..b092cde 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 ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEUI) +libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_TQT) $(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 b642baa..e712a82 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 $(LIB_QT) $(LIB_TDEUI) +libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -logg -lvorbis -lvorbisenc $(LIB_TQT) $(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 c7dbf90..7cd09fe 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 ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_QT) +libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_TQT) libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) pluginsdir = $(kde_datadir)/k3b/plugins diff --git a/plugins/project/audiometainforenamer/Makefile.am b/plugins/project/audiometainforenamer/Makefile.am index eaf50b7..79d37bc 100644 --- a/plugins/project/audiometainforenamer/Makefile.am +++ b/plugins/project/audiometainforenamer/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libk3baudiometainforenamerplugin.la libk3baudiometainforenamerplugin_la_SOURCES = k3baudiometainforenamerplugin.cpp libk3baudiometainforenamerplugin_la_LIBADD = ../../../libk3b/libk3b.la -libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice +libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice pluginsdir = $(kde_datadir)/k3b/plugins plugins_DATA = k3baudiometainforenamerplugin.plugin diff --git a/plugins/project/audioprojectcddb/Makefile.am b/plugins/project/audioprojectcddb/Makefile.am index aff9bde..3578ec0 100644 --- a/plugins/project/audioprojectcddb/Makefile.am +++ b/plugins/project/audioprojectcddb/Makefile.am @@ -14,7 +14,7 @@ libk3baudioprojectcddbplugin_la_SOURCES = k3baudioprojectcddbplugin.cpp libk3baudioprojectcddbplugin_la_LIBADD = ../../../libk3b/libk3b.la -libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice +libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -ltdeio -ltdecore -ltdeui -L../../../libk3bdevice/.libs -lk3bdevice pluginsdir = $(kde_datadir)/k3b/plugins plugins_DATA = k3baudioprojectcddbplugin.plugin diff --git a/src/Makefile.am b/src/Makefile.am index 31801df..f99a918 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,7 +74,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libk3b/tools \ METASOURCES = AUTO # the library search path. -k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/k3b rc_DATA = k3bui.rc eventsrc tips diff --git a/tdefile-plugins/k3bproject/Makefile.am b/tdefile-plugins/k3bproject/Makefile.am index 424c358..886e667 100644 --- a/tdefile-plugins/k3bproject/Makefile.am +++ b/tdefile-plugins/k3bproject/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = tdefile_k3bprojectfileplugin.h kde_module_LTLIBRARIES = tdefile_k3b.la tdefile_k3b_la_SOURCES = tdefile_k3bprojectfileplugin.cpp -tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) +tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) tdefile_k3b_la_LIBADD = $(LIB_TDEIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la # let automoc handle all of the meta source files (moc) diff --git a/tdeioslaves/videodvd/Makefile.am b/tdeioslaves/videodvd/Makefile.am index 3dc61ac..714f85f 100644 --- a/tdeioslaves/videodvd/Makefile.am +++ b/tdeioslaves/videodvd/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = tdeio_videodvd.la tdeio_videodvd_la_SOURCES = videodvd.cpp tdeio_videodvd_la_LIBADD = -ltdeio ../../libk3b/libk3b.la -tdeio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -ltdeio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice +tdeio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TQT) -ltdeio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice protocol_DATA = videodvd.protocol protocoldir = $(kde_servicesdir)