summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 21:46:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 21:46:54 -0600
commitffba74342b21eae1bda25ef4816415b71d0dcd6a (patch)
tree47ba1cef053ee8cefcbaeef1d38695673311b4d8
parentbc666a19ca87f1f606898fd9da4f5847e89ac0e1 (diff)
downloadtdemultimedia-ffba74342b21eae1bda25ef4816415b71d0dcd6a.tar.gz
tdemultimedia-ffba74342b21eae1bda25ef4816415b71d0dcd6a.zip
Rename additional instances of KDE to TDE
-rw-r--r--arts/builder/Makefile.am2
-rw-r--r--arts/gui/kde/Makefile.am4
-rw-r--r--arts/modules/Makefile.am2
-rw-r--r--arts/modules/common/Makefile.am2
-rw-r--r--arts/modules/synth/Makefile.am2
-rw-r--r--arts/tools/Makefile.am16
-rw-r--r--juk/Makefile.am6
-rw-r--r--kaboodle/Makefile.am8
-rw-r--r--kaudiocreator/Makefile.am4
-rw-r--r--kfile-plugins/au/Makefile.am2
-rw-r--r--kfile-plugins/avi/Makefile.am2
-rw-r--r--kfile-plugins/flac/Makefile.am2
-rw-r--r--kfile-plugins/m3u/Makefile.am2
-rw-r--r--kfile-plugins/mp3/Makefile.am2
-rw-r--r--kfile-plugins/mpc/Makefile.am2
-rw-r--r--kfile-plugins/mpeg/Makefile.am2
-rw-r--r--kfile-plugins/ogg/Makefile.am2
-rw-r--r--kfile-plugins/sid/Makefile.am2
-rw-r--r--kfile-plugins/theora/Makefile.am2
-rw-r--r--kfile-plugins/wav/Makefile.am2
-rw-r--r--kioslave/audiocd/kcmaudiocd/Makefile.am2
-rw-r--r--kioslave/audiocd/plugins/Makefile.am2
-rw-r--r--kmid/Makefile.am2
-rw-r--r--kmix/Makefile.am6
-rw-r--r--krec/Makefile.am14
-rw-r--r--kscd/Makefile.am2
-rw-r--r--kscd/kscdmagic/Makefile.am4
-rw-r--r--libkcddb/Makefile.am2
-rw-r--r--libkcddb/kcmcddb/Makefile.am2
-rw-r--r--noatun/Makefile.am2
-rw-r--r--noatun/library/Makefile.am2
-rw-r--r--xine_artsplugin/tools/thumbnail/Makefile.am2
32 files changed, 55 insertions, 55 deletions
diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am
index ec43c407..0edc1d2f 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl
+artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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 4dd4c650..71d504ae 100644
--- a/arts/gui/kde/Makefile.am
+++ b/arts/gui/kde/Makefile.am
@@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
artstestgui_SOURCES = artstestgui.cpp
artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
-artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
libartsgui_kde_la_METASOURCES = AUTO
diff --git a/arts/modules/Makefile.am b/arts/modules/Makefile.am
index 1f5fb09c..d604e8b9 100644
--- a/arts/modules/Makefile.am
+++ b/arts/modules/Makefile.am
@@ -35,7 +35,7 @@ libartsmodules_la_LIBADD = \
$(top_builddir)/arts/modules/common/libartsmodulescommon.la \
$(top_builddir)/arts/modules/effects/libartsmoduleseffects.la \
$(top_builddir)/arts/modules/mixers/libartsmodulesmixers.la \
- -lartsflow -lmcop $(LIB_KDECORE) $(LIBDL)
+ -lartsflow -lmcop $(LIB_TDECORE) $(LIBDL)
libartsmodules_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-no-undefined
diff --git a/arts/modules/common/Makefile.am b/arts/modules/common/Makefile.am
index 6742af36..7ff082db 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_KDECORE)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE)
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
diff --git a/arts/modules/synth/Makefile.am b/arts/modules/synth/Makefile.am
index e977fa85..e70751e0 100644
--- a/arts/modules/synth/Makefile.am
+++ b/arts/modules/synth/Makefile.am
@@ -33,7 +33,7 @@ libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
-lartsflow -lartsgsl -lartsflow_idl -lmcop
-#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
+#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE)
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
artsmodulessynth.cc artsmodulessynth.h artsmodulessynth.mcoptype artsmodulessynth.mcopclass: $(srcdir)/artsmodulessynth.idl $(MCOPIDL)
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index 942b8dd5..59900632 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -32,12 +32,12 @@ 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_KDECORE) $(LIB_KDEUI) -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_KDECORE) $(LIB_KDEUI) -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_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_LIBADD = \
-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
- $(LIB_KDEUI) ./libartscontrolsupport.la
+ $(LIB_TDEUI) ./libartscontrolsupport.la
# Arnolds version with dynamic-linking for testing.
#
@@ -46,21 +46,21 @@ libartscontrolapplet_la_LIBADD = \
# $(top_builddir)/arts/gui/common/libartsgui_idl.la \
# -L$(top_builddir)/arts/gui/kde -lartsgui_kde \
# -L$(top_builddir)/arts/modules -lartsmodules \
-# $(LIB_KDEUI)
+# $(LIB_TDEUI)
libartscontrolsupport_la_LIBADD = \
-lartsflow -lartsflow_idl -lmcop -lqtmcop $(LIBDL) -lsoundserver_idl -lartskde \
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
$(top_builddir)/arts/modules/libartsmodules.la \
- $(LIB_KDEUI)
+ $(LIB_TDEUI)
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_KDECORE) $(LIB_KDEUI)
+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_LDADD = libartscontrolsupport.la \
- $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
- -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_KDECORE) $(LIB_KDEUI)
+ $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
+ -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)
xdg_apps_DATA = artscontrol.desktop
diff --git a/juk/Makefile.am b/juk/Makefile.am
index ed42a909..101b1253 100644
--- a/juk/Makefile.am
+++ b/juk/Makefile.am
@@ -85,12 +85,12 @@ endif
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-tagguessertest_LDADD = $(LIB_KDECORE)
-tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+tagguessertest_LDADD = $(LIB_TDECORE)
+tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
SUBDIRS = pics
diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am
index 4a3f8fd8..0c1a0cee 100644
--- a/kaboodle/Makefile.am
+++ b/kaboodle/Makefile.am
@@ -15,8 +15,8 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \
libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer
libkaboodlepart_la_SOURCES = dummy.cpp
-libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
-libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
-kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
bin_PROGRAMS = kaboodle
diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am
index d2ed10cc..aa30ce8a 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) -lkutils $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO
@@ -20,7 +20,7 @@ messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot
kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \
- $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
KDE_ICON = AUTO
diff --git a/kfile-plugins/au/Makefile.am b/kfile-plugins/au/Makefile.am
index adf7a58b..77647de3 100644
--- a/kfile-plugins/au/Makefile.am
+++ b/kfile-plugins/au/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_au.h
kde_module_LTLIBRARIES = kfile_au.la
kfile_au_la_SOURCES = kfile_au.cpp
-kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_au_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/avi/Makefile.am b/kfile-plugins/avi/Makefile.am
index 760bf941..0577f2fe 100644
--- a/kfile-plugins/avi/Makefile.am
+++ b/kfile-plugins/avi/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_avi.h
kde_module_LTLIBRARIES = kfile_avi.la
kfile_avi_la_SOURCES = kfile_avi.cpp
-kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_avi_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/flac/Makefile.am b/kfile-plugins/flac/Makefile.am
index 17e080ee..2b091517 100644
--- a/kfile-plugins/flac/Makefile.am
+++ b/kfile-plugins/flac/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_flac.h
kde_module_LTLIBRARIES = kfile_flac.la
kfile_flac_la_SOURCES = kfile_flac.cpp
-kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
kfile_flac_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/m3u/Makefile.am b/kfile-plugins/m3u/Makefile.am
index 2d1575ce..a6289c6b 100644
--- a/kfile-plugins/m3u/Makefile.am
+++ b/kfile-plugins/m3u/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_m3u.h
kde_module_LTLIBRARIES = kfile_m3u.la
kfile_m3u_la_SOURCES = kfile_m3u.cpp
-kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_m3u_la_LIBADD = $(LIB_KSYCOCA)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/mp3/Makefile.am b/kfile-plugins/mp3/Makefile.am
index 9d573b6e..71f8239b 100644
--- a/kfile-plugins/mp3/Makefile.am
+++ b/kfile-plugins/mp3/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mp3.h
kde_module_LTLIBRARIES = kfile_mp3.la
kfile_mp3_la_SOURCES = kfile_mp3.cpp
-kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
kfile_mp3_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/mpc/Makefile.am b/kfile-plugins/mpc/Makefile.am
index b8470797..89b04866 100644
--- a/kfile-plugins/mpc/Makefile.am
+++ b/kfile-plugins/mpc/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpc.h
kde_module_LTLIBRARIES = kfile_mpc.la
kfile_mpc_la_SOURCES = kfile_mpc.cpp
-kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
+kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(taglib_libs) -module $(KDE_PLUGIN)
kfile_mpc_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/mpeg/Makefile.am b/kfile-plugins/mpeg/Makefile.am
index a7733f93..7b5392b6 100644
--- a/kfile-plugins/mpeg/Makefile.am
+++ b/kfile-plugins/mpeg/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_mpeg.h
kde_module_LTLIBRARIES = kfile_mpeg.la
kfile_mpeg_la_SOURCES = kfile_mpeg.cpp
-kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_mpeg_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/ogg/Makefile.am b/kfile-plugins/ogg/Makefile.am
index 4002a77e..a5080db7 100644
--- a/kfile-plugins/ogg/Makefile.am
+++ b/kfile-plugins/ogg/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ogg.h
kde_module_LTLIBRARIES = kfile_ogg.la
kfile_ogg_la_SOURCES = kfile_ogg.cpp vcedit.c
-kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/sid/Makefile.am b/kfile-plugins/sid/Makefile.am
index 43e1b523..834236b4 100644
--- a/kfile-plugins/sid/Makefile.am
+++ b/kfile-plugins/sid/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_sid.h
kde_module_LTLIBRARIES = kfile_sid.la
kfile_sid_la_SOURCES = kfile_sid.cpp
-kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_sid_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/theora/Makefile.am b/kfile-plugins/theora/Makefile.am
index 7f31443a..9b0d73d3 100644
--- a/kfile-plugins/theora/Makefile.am
+++ b/kfile-plugins/theora/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_theora.h
kde_module_LTLIBRARIES = kfile_theora.la
kfile_theora_la_SOURCES = kfile_theora.cpp
-kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora
# let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/wav/Makefile.am b/kfile-plugins/wav/Makefile.am
index 45e1eef6..05843fb3 100644
--- a/kfile-plugins/wav/Makefile.am
+++ b/kfile-plugins/wav/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kfile_wav.h
kde_module_LTLIBRARIES = kfile_wav.la
kfile_wav_la_SOURCES = kfile_wav.cpp
-kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
+kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module $(KDE_PLUGIN)
kfile_wav_la_LIBADD = $(LIB_KIO)
# let automoc handle all of the meta source files (moc)
diff --git a/kioslave/audiocd/kcmaudiocd/Makefile.am b/kioslave/audiocd/kcmaudiocd/Makefile.am
index 962c3fa0..73d6be2d 100644
--- a/kioslave/audiocd/kcmaudiocd/Makefile.am
+++ b/kioslave/audiocd/kcmaudiocd/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_audiocd.la
kcm_audiocd_la_SOURCES = audiocdconfig.ui kcmaudiocd.cpp
kcm_audiocd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kcm_audiocd_la_LIBADD = ../plugins/libaudiocdplugins.la $(LIB_KDEUI)
+kcm_audiocd_la_LIBADD = ../plugins/libaudiocdplugins.la $(LIB_TDEUI)
INCLUDES = -I$(srcdir)/../plugins -I$(top_srcdir)/libkcddb $(all_includes)
diff --git a/kioslave/audiocd/plugins/Makefile.am b/kioslave/audiocd/plugins/Makefile.am
index 2dd4589c..4dca0d30 100644
--- a/kioslave/audiocd/plugins/Makefile.am
+++ b/kioslave/audiocd/plugins/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/libkcddb $(all_includes)
lib_LTLIBRARIES = libaudiocdplugins.la
-libaudiocdplugins_la_LIBADD = $(LIB_KDECORE) $(top_builddir)/libkcddb/libkcddb.la
+libaudiocdplugins_la_LIBADD = $(LIB_TDECORE) $(top_builddir)/libkcddb/libkcddb.la
libaudiocdplugins_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
diff --git a/kmid/Makefile.am b/kmid/Makefile.am
index d4c9545c..db7784e7 100644
--- a/kmid/Makefile.am
+++ b/kmid/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS = kmidframe.h kmidclient.h kdisptext.h \
channelcfgdlg.h instrname.h rhythmview.h \
songlist.h slman.h kmid_part.h
-kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kmid_SOURCES = main.cpp
kmid_LDADD = libkmidlib.la
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 42f09d33..50513635 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_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
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_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LIBADD = $(LIB_TDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
@@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
xdg_apps_DATA = kmix.desktop
diff --git a/krec/Makefile.am b/krec/Makefile.am
index c14df4ac..a8091776 100644
--- a/krec/Makefile.am
+++ b/krec/Makefile.am
@@ -42,20 +42,20 @@ krec_la_SOURCES = \
main.cpp \
krecord.cpp
-krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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 \
$(top_builddir)/arts/tools/libartscontrolsupport.la \
- -lartskde $(LIBDL) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KUTILS)
+ -lartskde $(LIBDL) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KUTILS)
kcm_krec_la_SOURCES = krecconfigure.cpp
-kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
kcm_krec_files_la_SOURCES = krecconfig_files.cpp
-kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KUTILS)
@@ -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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
-lib_krec_common_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+lib_krec_common_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
libkrecexport_wave_la_SOURCES = krecexport_wave.cpp
-libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects
+libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -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 edb2eaf6..d782683a 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \
$(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \
libkcompactdisc.la -lpthread
diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am
index e28ba7c4..27c9454d 100644
--- a/kscd/kscdmagic/Makefile.am
+++ b/kscd/kscdmagic/Makefile.am
@@ -26,11 +26,11 @@ 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kscdmagic_LDADD = -lm $(LIB_KDEUI)
+kscdmagic_LDADD = -lm $(LIB_TDEUI)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = symbol.h syna.h xlib.h magicconf.h
diff --git a/libkcddb/Makefile.am b/libkcddb/Makefile.am
index e5b88c90..8fcfe188 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_KDECORE) $(LIB_KIO)
+libkcddb_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO)
METASOURCES = AUTO
diff --git a/libkcddb/kcmcddb/Makefile.am b/libkcddb/kcmcddb/Makefile.am
index cc638047..8233116d 100644
--- a/libkcddb/kcmcddb/Makefile.am
+++ b/libkcddb/kcmcddb/Makefile.am
@@ -8,7 +8,7 @@ kcm_cddb_la_SOURCES = \
kcm_cddb_la_LDFLAGS = \
$(all_libraries) -module -avoid-version -no-undefined
-kcm_cddb_la_LIBADD = ../libkcddb.la $(LIB_KDEUI)
+kcm_cddb_la_LIBADD = ../libkcddb.la $(LIB_TDEUI)
kcm_cddb_la_COMPILE_FIRST = ../configbase.h
diff --git a/noatun/Makefile.am b/noatun/Makefile.am
index 3ab6112b..f64f6d5e 100644
--- a/noatun/Makefile.am
+++ b/noatun/Makefile.am
@@ -16,7 +16,7 @@ kconfdir = $(libdir)/kconf_update_bin
kconf_PROGRAMS = noatun20update
noatun20update_SOURCES = noatun20update.cpp
-noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noatun20update_LDADD = $(LIB_QT)
messages:
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am
index 13ae1e4c..b3882b48 100644
--- a/noatun/library/Makefile.am
+++ b/noatun/library/Makefile.am
@@ -34,7 +34,7 @@ libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
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_KDEUI)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_TDEUI)
METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun
diff --git a/xine_artsplugin/tools/thumbnail/Makefile.am b/xine_artsplugin/tools/thumbnail/Makefile.am
index 40358fda..069b2dd1 100644
--- a/xine_artsplugin/tools/thumbnail/Makefile.am
+++ b/xine_artsplugin/tools/thumbnail/Makefile.am
@@ -10,7 +10,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = videothumbnail.la
videothumbnail_la_SOURCES = videocreator.cpp videoscaler.cpp
-videothumbnail_la_LIBADD = $(XINE_LIBS) $(LIB_KDECORE)
+videothumbnail_la_LIBADD = $(XINE_LIBS) $(LIB_TDECORE)
videothumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -pthread
noinst_HEADERS = videocreator.h