summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:53 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-17 23:19:53 +0900
commit6f0c68f96a6522ecf7bbaec92841d7b5e49f5156 (patch)
tree0c1acabac92a7ec0d2c49cd0d0956e12cd9fd0c5
parenta5174f98fe5f4849282ca4e758540a2f80ba7ee8 (diff)
downloadtdemultimedia-6f0c68f96a6522ecf7bbaec92841d7b5e49f5156.zip
tdemultimedia-6f0c68f96a6522ecf7bbaec92841d7b5e49f5156.tar.gz
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--arts/builder/Makefile.am2
-rw-r--r--arts/gui/kde/Makefile.am6
-rw-r--r--arts/midi/Makefile.am4
-rw-r--r--arts/modules/common/Makefile.am2
-rw-r--r--arts/tools/Makefile.am8
-rw-r--r--juk/Makefile.am4
-rw-r--r--kaboodle/Makefile.am8
-rw-r--r--kaudiocreator/Makefile.am4
-rw-r--r--kmix/Makefile.am4
-rw-r--r--krec/Makefile.am10
-rw-r--r--kscd/Makefile.am2
-rw-r--r--kscd/kscdmagic/Makefile.am2
-rw-r--r--libkcddb/Makefile.am2
-rw-r--r--libkcddb/test/Makefile.am20
-rw-r--r--mpeglib/example/cddaplay/Makefile.am2
-rw-r--r--mpeglib/example/mpgplay/Makefile.am2
-rw-r--r--mpeglib/example/splay/Makefile.am4
-rw-r--r--mpeglib/example/tplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafcdda/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafmpgplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafsplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yaftplay/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafvorbis/Makefile.am2
-rw-r--r--mpeglib/example/yaf/yafyuv/Makefile.am2
-rw-r--r--mpeglib_artsplug/Makefile.am2
-rw-r--r--noatun/Makefile.am4
-rw-r--r--noatun/library/Makefile.am6
-rw-r--r--tdefile-plugins/au/Makefile.am2
-rw-r--r--tdefile-plugins/avi/Makefile.am2
-rw-r--r--tdefile-plugins/flac/Makefile.am2
-rw-r--r--tdefile-plugins/m3u/Makefile.am2
-rw-r--r--tdefile-plugins/mp3/Makefile.am2
-rw-r--r--tdefile-plugins/mpc/Makefile.am2
-rw-r--r--tdefile-plugins/mpeg/Makefile.am2
-rw-r--r--tdefile-plugins/ogg/Makefile.am2
-rw-r--r--tdefile-plugins/sid/Makefile.am2
-rw-r--r--tdefile-plugins/theora/Makefile.am2
-rw-r--r--tdefile-plugins/wav/Makefile.am2
-rw-r--r--tdemid/Makefile.am4
-rw-r--r--xine_artsplugin/Makefile.am2
40 files changed, 70 insertions, 70 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am
index f65fd42..4740809 100644
--- a/arts/builder/Makefile.am
+++ b/arts/builder/Makefile.am
@@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h
METASOURCES = AUTO
-artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl
+artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am
index 440af44..a0fc326 100644
--- a/arts/gui/kde/Makefile.am
+++ b/arts/gui/kde/Makefile.am
@@ -15,7 +15,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
-libartsgui_kde_la_LIBADD = $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -ltdefx \
+libartsgui_kde_la_LIBADD = $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TQT) -ltdefx \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
@@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
artstestgui_SOURCES = artstestgui.cpp
artstestgui_LDADD = -lmcop -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
-artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
dbtest_SOURCES = dbtest.cpp
dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la
-dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
libartsgui_kde_la_METASOURCES = AUTO
diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index d097dc8..fc12052 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -9,12 +9,12 @@ bin_PROGRAMS = midisend
noinst_PROGRAMS = midisynctest
midisend_SOURCES = midisend.cc midimsg.c
-midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl
+midisend_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl
midisend_LDADD = libartsmidi_idl.la -lartsflow_idl
midisend_COMPILE_FIRST = artsmidi.h
midisynctest_SOURCES = midisynctest.cc
-midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_QT) -lmcop -lartsflow_idl -lartsmidi_idl
+midisynctest_LDFLAGS = $(all_libraries) $(LIB_TQT) $(KDE_RPATH) $(LIBPTHREAD) $(LIB_TQT) -lmcop -lartsflow_idl -lartsmidi_idl
midisynctest_LDADD = libartsmidi.la -lsoundserver_idl -lartsflow_idl -lartsmidi_idl
midisynctest_COMPILE_FIRST = artsmidi.h
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index bcf472f..1841d23 100644
--- a/arts/modules/common/Makefile.am
+++ b/arts/modules/common/Makefile.am
@@ -25,7 +25,7 @@ libartsmodulescommon_la_LIBADD = \
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_TQT) -lgthread-2.0 $(ARTS_LIBS)
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index 49b9055..138afe4 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -32,8 +32,8 @@ SOMAJOR = 1
SOMINOR = 0
SOSUBMINOR = 0
-libartscontrolapplet_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
-libartscontrolsupport_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
+libartscontrolapplet_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined -module
+libartscontrolsupport_la_LDFLAGS = $(all_libraries) -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -no-undefined
libartscontrolapplet_la_LIBADD = \
-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
@@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \
bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp
-artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
artscontrol_LDADD = libartscontrolsupport.la \
$(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEFILE) \
- -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
+ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI)
xdg_apps_DATA = artscontrol.desktop
diff --git a/juk/Makefile.am b/juk/Makefile.am
index 678e34f..d2631bd 100644
--- a/juk/Makefile.am
+++ b/juk/Makefile.am
@@ -85,12 +85,12 @@ endif
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_TDEIO) $(taglib_libs) $(akode_libs) $(LIB_TDEHTML) $(LIB_ARTS)
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs)
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
tagguessertest_LDADD = $(LIB_TDECORE)
-tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+tagguessertest_LDFLAGS = $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
SUBDIRS = pics
diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am
index 7ebea04..e129885 100644
--- a/kaboodle/Makefile.am
+++ b/kaboodle/Makefile.am
@@ -15,8 +15,8 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \
libs = $(LIB_TDEPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -ltdemediaplayer
libkaboodlepart_la_SOURCES = dummy.cpp
-libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
-libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
kaboodle_SOURCES = main.cpp \
kaboodleapp.cpp \
@@ -27,8 +27,8 @@ dummy.cpp:
CLEANFILES = dummy.cpp
-kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
-kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
bin_PROGRAMS = kaboodle
diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am
index 7248558..bc6ff2a 100644
--- a/kaudiocreator/Makefile.am
+++ b/kaudiocreator/Makefile.am
@@ -12,7 +12,7 @@ kaudiocreator_SOURCES = main.cpp kaudiocreator.cpp encoder.cpp \
EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \
obqueimp.h ripper.h tracksimp.h encodefileimp.h
-kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdeutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdeutils $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
METASOURCES = AUTO
@@ -20,7 +20,7 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot
kaudiocreator_LDADD = $(LIB_TDEIO) $(top_builddir)/libkcddb/libkcddb.la \
- $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ $(top_builddir)/kscd/libkcompactdisc.la $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON = AUTO
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index c7ec461..1de7f12 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
-kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_TDECORE) -lDCOP
+kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) $(LIB_TDECORE) -lDCOP
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
mixertoolbox.cpp mixer_backend.cpp
-kmixctrl_la_LIBADD = $(LIB_TDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
+kmixctrl_la_LIBADD = $(LIB_TDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) -lDCOP
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
diff --git a/krec/Makefile.am b/krec/Makefile.am
index a07b077..4cb54ed 100644
--- a/krec/Makefile.am
+++ b/krec/Makefile.am
@@ -42,7 +42,7 @@ krec_la_SOURCES = \
main.cpp \
krecord.cpp
-krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
krec_la_LIBADD = \
lib_krec_common.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
@@ -50,12 +50,12 @@ krec_la_LIBADD = \
-lartskde $(LIBDL) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEUTILS)
kcm_krec_la_SOURCES = krecconfigure.cpp
-kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_TDEUTILS)
kcm_krec_files_la_SOURCES = krecconfig_files.cpp
-kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_TDEUTILS)
@@ -64,12 +64,12 @@ lib_krec_common_la_SOURCES = \
krecexport_template.cpp \
krecconfig_fileswidget.cpp
-lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
lib_krec_common_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
libkrecexport_wave_la_SOURCES = krecexport_wave.cpp
-libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
libkrecexport_wave_la_LIBADD = lib_krec_common.la
diff --git a/kscd/Makefile.am b/kscd/Makefile.am
index 3e37fb5..c7091a6 100644
--- a/kscd/Makefile.am
+++ b/kscd/Makefile.am
@@ -23,7 +23,7 @@ libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread
kde_kcfg_DATA = kscd.kcfg
-kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \
$(LIBFPE) $(LIB_TDEIO) -ltdeutils $(top_builddir)/libkcddb/libkcddb.la \
libkcompactdisc.la -lpthread
diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am
index 49e2770..13031d2 100644
--- a/kscd/kscdmagic/Makefile.am
+++ b/kscd/kscdmagic/Makefile.am
@@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic
kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c
# the library search path.
-kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
diff --git a/libkcddb/Makefile.am b/libkcddb/Makefile.am
index 6b04f67..11eb43f 100644
--- a/libkcddb/Makefile.am
+++ b/libkcddb/Makefile.am
@@ -14,7 +14,7 @@ libkcddb_la_SOURCES = \
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
-libkcddb_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDEUI)
+libkcddb_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDEUI)
METASOURCES = AUTO
diff --git a/libkcddb/test/Makefile.am b/libkcddb/test/Makefile.am
index 320b590..e9b7d3f 100644
--- a/libkcddb/test/Makefile.am
+++ b/libkcddb/test/Makefile.am
@@ -7,51 +7,51 @@ check_PROGRAMS = syncsmtpsubmittest asyncsmtpsubmittest asynchttplookuptest \
syncsmtpsubmittest_SOURCES = syncsmtpsubmittest.cpp
syncsmtpsubmittest_LDFLAGS = $(all_libraries)
syncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
asyncsmtpsubmittest_SOURCES = asyncsmtpsubmittest.cpp
asyncsmtpsubmittest_LDFLAGS = $(all_libraries)
asyncsmtpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
asynchttplookuptest_SOURCES = asynchttplookuptest.cpp
asynchttplookuptest_LDFLAGS = $(all_libraries)
asynchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
asynccddblookuptest_SOURCES = asynccddblookuptest.cpp
asynccddblookuptest_LDFLAGS = $(all_libraries)
asynccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
synchttplookuptest_SOURCES = synchttplookuptest.cpp
synchttplookuptest_LDFLAGS = $(all_libraries)
synchttplookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
synccddblookuptest_SOURCES = synccddblookuptest.cpp
synccddblookuptest_LDFLAGS = $(all_libraries)
synccddblookuptest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
synchttpsubmittest_SOURCES = synchttpsubmittest.cpp
synchttpsubmittest_LDFLAGS = $(all_libraries)
synchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
asynchttpsubmittest_SOURCES = asynchttpsubmittest.cpp
asynchttpsubmittest_LDFLAGS = $(all_libraries)
asynchttpsubmittest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
utf8test_SOURCES = utf8test.cpp
utf8test_LDFLAGS = $(all_libraries)
utf8test_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
sitestest_SOURCES = sitestest.cpp
sitestest_LDFLAGS = $(all_libraries)
sitestest_LDADD = $(top_builddir)/libkcddb/libkcddb.la \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
+ $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
METASOURCES = AUTO
diff --git a/mpeglib/example/cddaplay/Makefile.am b/mpeglib/example/cddaplay/Makefile.am
index a7a5286..cc0dca2 100644
--- a/mpeglib/example/cddaplay/Makefile.am
+++ b/mpeglib/example/cddaplay/Makefile.am
@@ -10,7 +10,7 @@ cddaplay_SOURCES = cddaplay.cpp
noinst_HEADERS =
-cddaplay_LDFLAGS = $(all_libraries) $(LIB_QT)
+cddaplay_LDFLAGS = $(all_libraries) $(LIB_TQT)
cddaplay_LDADD = ../../lib/libmpeg.la \
diff --git a/mpeglib/example/mpgplay/Makefile.am b/mpeglib/example/mpgplay/Makefile.am
index 303823d..bb5c658 100644
--- a/mpeglib/example/mpgplay/Makefile.am
+++ b/mpeglib/example/mpgplay/Makefile.am
@@ -10,7 +10,7 @@ mpgplay_SOURCES = mpgplay.cpp
noinst_HEADERS =
-mpgplay_LDFLAGS = $(all_libraries) $(LIB_QT)
+mpgplay_LDFLAGS = $(all_libraries) $(LIB_TQT)
mpgplay_LDADD = ../../lib/libmpeg.la \
$(THIS_LIB_LIBS)
diff --git a/mpeglib/example/splay/Makefile.am b/mpeglib/example/splay/Makefile.am
index 9da0145..0b8e03d 100644
--- a/mpeglib/example/splay/Makefile.am
+++ b/mpeglib/example/splay/Makefile.am
@@ -12,12 +12,12 @@ mp3framing_SOURCES = mp3framing.cpp
noinst_HEADERS =
-splay_LDFLAGS = $(all_libraries) $(LIB_QT)
+splay_LDFLAGS = $(all_libraries) $(LIB_TQT)
splay_LDADD = ../../lib/libmpeg.la \
$(THIS_LIB_LIBS)
-mp3framing_LDFLAGS = $(all_libraries) $(LIB_QT)
+mp3framing_LDFLAGS = $(all_libraries) $(LIB_TQT)
mp3framing_LDADD = ../../lib/libmpeg.la \
$(THIS_LIB_LIBS)
diff --git a/mpeglib/example/tplay/Makefile.am b/mpeglib/example/tplay/Makefile.am
index 2f298a8..35fa037 100644
--- a/mpeglib/example/tplay/Makefile.am
+++ b/mpeglib/example/tplay/Makefile.am
@@ -10,7 +10,7 @@ tplay_SOURCES = tplay.cpp
noinst_HEADERS =
-tplay_LDFLAGS = $(all_libraries) $(LIB_QT)
+tplay_LDFLAGS = $(all_libraries) $(LIB_TQT)
tplay_LDADD = ../../lib/libmpeg.la \
diff --git a/mpeglib/example/yaf/yafcdda/Makefile.am b/mpeglib/example/yaf/yafcdda/Makefile.am
index 287fc8e..ce326b1 100644
--- a/mpeglib/example/yaf/yafcdda/Makefile.am
+++ b/mpeglib/example/yaf/yafcdda/Makefile.am
@@ -10,7 +10,7 @@ yaf_cdda_SOURCES = cdda_control.cpp
noinst_HEADERS =
-yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_cdda_LDADD = ../yafxplayer/libyafxplayer.la \
diff --git a/mpeglib/example/yaf/yafmpgplay/Makefile.am b/mpeglib/example/yaf/yafmpgplay/Makefile.am
index 811e3d9..ac2baa7 100644
--- a/mpeglib/example/yaf/yafmpgplay/Makefile.am
+++ b/mpeglib/example/yaf/yafmpgplay/Makefile.am
@@ -11,7 +11,7 @@ yaf_mpgplay_SOURCES = mpg_control.cpp
noinst_HEADERS =
-yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_mpgplay_LDADD = ../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafsplay/Makefile.am b/mpeglib/example/yaf/yafsplay/Makefile.am
index 40c8196..5fdefc3 100644
--- a/mpeglib/example/yaf/yafsplay/Makefile.am
+++ b/mpeglib/example/yaf/yafsplay/Makefile.am
@@ -11,7 +11,7 @@ yaf_splay_SOURCES = splay_control.cpp
noinst_HEADERS =
-yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_splay_LDADD = ../yafxplayer/libyafxplayer.la \
diff --git a/mpeglib/example/yaf/yaftplay/Makefile.am b/mpeglib/example/yaf/yaftplay/Makefile.am
index 96b596b..1e77edf 100644
--- a/mpeglib/example/yaf/yaftplay/Makefile.am
+++ b/mpeglib/example/yaf/yaftplay/Makefile.am
@@ -9,7 +9,7 @@ yaf_tplay_SOURCES = tplay_control.cpp
noinst_HEADERS =
-yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_tplay_LDADD = ../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafvorbis/Makefile.am b/mpeglib/example/yaf/yafvorbis/Makefile.am
index d07fdbd..9889c44 100644
--- a/mpeglib/example/yaf/yafvorbis/Makefile.am
+++ b/mpeglib/example/yaf/yafvorbis/Makefile.am
@@ -10,7 +10,7 @@ yaf_vorbis_SOURCES = vorbis_control.cpp
noinst_HEADERS =
-yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_vorbis_LDADD = \
../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafyuv/Makefile.am b/mpeglib/example/yaf/yafyuv/Makefile.am
index 47767a3..bd4fa4a 100644
--- a/mpeglib/example/yaf/yafyuv/Makefile.am
+++ b/mpeglib/example/yaf/yafyuv/Makefile.am
@@ -11,7 +11,7 @@ yaf_yuv_SOURCES = yuv_control.cpp
noinst_HEADERS =
-yaf_yuv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT)
+yaf_yuv_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT)
yaf_yuv_LDADD = ../yafxplayer/libyafxplayer.la \
diff --git a/mpeglib_artsplug/Makefile.am b/mpeglib_artsplug/Makefile.am
index 1fe9b85..d6dc0f6 100644
--- a/mpeglib_artsplug/Makefile.am
+++ b/mpeglib_artsplug/Makefile.am
@@ -94,7 +94,7 @@ libarts_splay_la_LIBADD = $(top_builddir)/mpeglib/lib/libmpeg.la \
bin_PROGRAMS = mpeglibartsplay
-mpeglibartsplay_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) $(LIB_QT)
+mpeglibartsplay_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) $(LIB_TQT)
mpeglibartsplay_SOURCES = mpeglibartsplay.cpp
mpeglibartsplay_LDADD = -lsoundserver_idl \
diff --git a/noatun/Makefile.am b/noatun/Makefile.am
index 5a3075c..83ef40c 100644
--- a/noatun/Makefile.am
+++ b/noatun/Makefile.am
@@ -16,8 +16,8 @@ tdeconfdir = $(libdir)/tdeconf_update_bin
tdeconf_PROGRAMS = noatun20update
noatun20update_SOURCES = noatun20update.cpp
-noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-noatun20update_LDADD = $(LIB_QT)
+noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+noatun20update_LDADD = $(LIB_TQT)
messages:
$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` > rc.cpp
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am
index 9e0961e..dd9a36a 100644
--- a/noatun/library/Makefile.am
+++ b/noatun/library/Makefile.am
@@ -30,18 +30,18 @@ libnoatun_la_LDFLAGS = \
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-ltdeio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_TQT) -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE)
METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun
noinst_PROGRAMS = gentable
gentable_SOURCES = gentable.cpp
-gentable_LDFLAGS = $(KDE_EXTRA_RPATH) $(LIB_QT) $(QT_LDFLAGS)
+gentable_LDFLAGS = $(KDE_EXTRA_RPATH) $(LIB_TQT) $(QT_LDFLAGS)
magictable: gentable
$(top_builddir)/noatun/library/gentable > magictable
diff --git a/tdefile-plugins/au/Makefile.am b/tdefile-plugins/au/Makefile.am
index da2be24..1aebfdc 100644
--- a/tdefile-plugins/au/Makefile.am
+++ b/tdefile-plugins/au/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_au.h
kde_module_LTLIBRARIES = tdefile_au.la
tdefile_au_la_SOURCES = tdefile_au.cpp
-tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_au_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/avi/Makefile.am b/tdefile-plugins/avi/Makefile.am
index b001c37..6d7172c 100644
--- a/tdefile-plugins/avi/Makefile.am
+++ b/tdefile-plugins/avi/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_avi.h
kde_module_LTLIBRARIES = tdefile_avi.la
tdefile_avi_la_SOURCES = tdefile_avi.cpp
-tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_avi_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/flac/Makefile.am b/tdefile-plugins/flac/Makefile.am
index 5438d8d..f4c4bb9 100644
--- a/tdefile-plugins/flac/Makefile.am
+++ b/tdefile-plugins/flac/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_flac.h
kde_module_LTLIBRARIES = tdefile_flac.la
tdefile_flac_la_SOURCES = tdefile_flac.cpp
-tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
tdefile_flac_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/m3u/Makefile.am b/tdefile-plugins/m3u/Makefile.am
index 8564a52..cdbf9ba 100644
--- a/tdefile-plugins/m3u/Makefile.am
+++ b/tdefile-plugins/m3u/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_m3u.h
kde_module_LTLIBRARIES = tdefile_m3u.la
tdefile_m3u_la_SOURCES = tdefile_m3u.cpp
-tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_m3u_la_LIBADD = $(LIB_TDESYCOCA)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/mp3/Makefile.am b/tdefile-plugins/mp3/Makefile.am
index 44caf98..37d0d4e 100644
--- a/tdefile-plugins/mp3/Makefile.am
+++ b/tdefile-plugins/mp3/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_mp3.h
kde_module_LTLIBRARIES = tdefile_mp3.la
tdefile_mp3_la_SOURCES = tdefile_mp3.cpp
-tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
tdefile_mp3_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/mpc/Makefile.am b/tdefile-plugins/mpc/Makefile.am
index 92bc72b..0854778 100644
--- a/tdefile-plugins/mpc/Makefile.am
+++ b/tdefile-plugins/mpc/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_mpc.h
kde_module_LTLIBRARIES = tdefile_mpc.la
tdefile_mpc_la_SOURCES = tdefile_mpc.cpp
-tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN)
tdefile_mpc_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/mpeg/Makefile.am b/tdefile-plugins/mpeg/Makefile.am
index 8680974..a1bcb89 100644
--- a/tdefile-plugins/mpeg/Makefile.am
+++ b/tdefile-plugins/mpeg/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_mpeg.h
kde_module_LTLIBRARIES = tdefile_mpeg.la
tdefile_mpeg_la_SOURCES = tdefile_mpeg.cpp
-tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_mpeg_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/ogg/Makefile.am b/tdefile-plugins/ogg/Makefile.am
index d70431a..dcbf80e 100644
--- a/tdefile-plugins/ogg/Makefile.am
+++ b/tdefile-plugins/ogg/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_ogg.h
kde_module_LTLIBRARIES = tdefile_ogg.la
tdefile_ogg_la_SOURCES = tdefile_ogg.cpp vcedit.c
-tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_ogg_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -lvorbisfile
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/sid/Makefile.am b/tdefile-plugins/sid/Makefile.am
index df10481..1a19487 100644
--- a/tdefile-plugins/sid/Makefile.am
+++ b/tdefile-plugins/sid/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_sid.h
kde_module_LTLIBRARIES = tdefile_sid.la
tdefile_sid_la_SOURCES = tdefile_sid.cpp
-tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_sid_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/theora/Makefile.am b/tdefile-plugins/theora/Makefile.am
index aa33481..069dd1a 100644
--- a/tdefile-plugins/theora/Makefile.am
+++ b/tdefile-plugins/theora/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_theora.h
kde_module_LTLIBRARIES = tdefile_theora.la
tdefile_theora_la_SOURCES = tdefile_theora.cpp
-tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_theora_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -ltheora
# let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/wav/Makefile.am b/tdefile-plugins/wav/Makefile.am
index b194ba6..c3b14f5 100644
--- a/tdefile-plugins/wav/Makefile.am
+++ b/tdefile-plugins/wav/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = tdefile_wav.h
kde_module_LTLIBRARIES = tdefile_wav.la
tdefile_wav_la_SOURCES = tdefile_wav.cpp
-tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
+tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_wav_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc)
diff --git a/tdemid/Makefile.am b/tdemid/Makefile.am
index fe5b2b3..d48aa31 100644
--- a/tdemid/Makefile.am
+++ b/tdemid/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la
lib_LTLIBRARIES = libtdemidlib.la
libtdemidlib_la_LDFLAGS = $(all_libraries)
-libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE)
+libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEIO) -ltdemid $(LIB_TQT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE)
libtdemidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libtdemidpart_la_LIBADD = libtdemidlib.la
@@ -28,7 +28,7 @@ noinst_HEADERS = tdemidframe.h tdemidclient.h kdisptext.h \
channelcfgdlg.h instrname.h rhythmview.h \
songlist.h slman.h tdemid_part.h
-tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdemid_SOURCES = main.cpp
tdemid_LDADD = libtdemidlib.la
diff --git a/xine_artsplugin/Makefile.am b/xine_artsplugin/Makefile.am
index 395873b..c7b8a22 100644
--- a/xine_artsplugin/Makefile.am
+++ b/xine_artsplugin/Makefile.am
@@ -8,7 +8,7 @@ libarts_xine_la_SOURCES = xinePlayObject.cc \
xinePlayObject_impl.cpp \
audio_fifo_out.c
libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) $(LIB_QT) \
+libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) $(LIB_TQT) \
-lkmedia2_idl -lsoundserver_idl -lartsflow
libarts_xine_la_METASOURCES = AUTO