Rename additional instances of KDE to TDE

58 files changed, 90 insertions, 90 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a41853cf..ffaf0b1e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2059,8 +2059,8 @@ if test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2069,9 +2069,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2080,8 +2080,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2090,13 +2090,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am
index 9ec16a40..635fd672 100644
--- a/chalk/chalkcolor/Makefile.am
+++ b/chalk/chalkcolor/Makefile.am
@@ -19,7 +19,7 @@ libchalkcolor_la_SOURCES = kis_color.cc kis_colorspace.cc \
 	kis_u16_base_colorspace.cc kis_f32_base_colorspace.cc $(OPENEXR_SOURCES)
 
 libchalkcolor_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
-libchalkcolor_la_LIBADD  = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_KPARTS) $(LIB_KDECORE) $(LIB_QT) $(OPENEXR_LIBS)
+libchalkcolor_la_LIBADD  = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
 
 include_HEADERS =  \
     kis_channelinfo.h \
diff --git a/chalk/core/Makefile.am b/chalk/core/Makefile.am
index 30b1eb07..8dff83b2 100644
--- a/chalk/core/Makefile.am
+++ b/chalk/core/Makefile.am
@@ -45,7 +45,7 @@ include_HEADERS = kis_adjustment_layer.h kis_alpha_mask.h \
 		kis_filter_configuration.h kis_exif_info.h kis_exif_value.h kis_substrate.h kis_perspective_math.h kis_scale_visitor.h kis_paint_layer.h kis_layer_visitor.h kis_filter_strategy.h kis_transform_worker.h
 
 libchalkimage_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
-libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_KDECORE) $(LIB_QT) $(OPENEXR_LIBS) 
+libchalkimage_la_LIBADD = ../sdk/libchalksdk.la ../chalkcolor/libchalkcolor.la tiles/libchalktile.la $(OPENEXR_LIBS) $(LCMS_LIBS) $(LIB_KOFFICECORE) $(LIB_KOPAINTER) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS) 
 
 if include_kunittest_tests
 TESTSDIR = tests
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index 17754694..ac4a959b 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@@ -15,7 +15,7 @@ krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lt
         -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore
 krosschalkcore_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     $(top_builddir)/lib/kross/api/libkrossapi.la \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
     $(top_builddir)/chalk/libchalkcommon.la \
diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am
index 241e1e8f..8e2168de 100644
--- a/filters/kformula/latex/Makefile.am
+++ b/filters/kformula/latex/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am
index 580df1ca..cf35f8f3 100644
--- a/filters/kformula/png/Makefile.am
+++ b/filters/kformula/png/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am
index 1c6a3c0e..ee606211 100644
--- a/filters/kformula/svg/Makefile.am
+++ b/filters/kformula/svg/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am
index 3a73d1c0..f16a130b 100644
--- a/filters/kspread/latex/export/Makefile.am
+++ b/filters/kspread/latex/export/Makefile.am
@@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am
index ffb4efb0..83ec0683 100644
--- a/filters/kword/latex/export/Makefile.am
+++ b/filters/kword/latex/export/Makefile.am
@@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am
index f295865f..6f91f004 100644
--- a/filters/kword/latex/import/Makefile.am
+++ b/filters/kword/latex/import/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am
index 380db4d9..b6352c75 100644
--- a/filters/kword/latex/import/parser/Makefile.am
+++ b/filters/kword/latex/import/parser/Makefile.am
@@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y
 check_PROGRAMS = texlauncher
 texlauncher_SOURCES = texlauncher.cc
 texlauncher_LDADD = liblatexexport.la
-texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/kchart/kdchart/Makefile.am b/kchart/kdchart/Makefile.am
index 0538e50c..0f54972e 100644
--- a/kchart/kdchart/Makefile.am
+++ b/kchart/kdchart/Makefile.am
@@ -39,7 +39,7 @@ libkdchart_la_SOURCES = KDChart.cpp 		\
                         #KDChartWrapperFactory.cpp
 
 libkdchart_la_LDFLAGS = $(all_libraries) -no-undefined
-libkdchart_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+libkdchart_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
 
 noinst_HEADERS =	KDChart.h 		\
 			KDChartAreaPainter.h	\
diff --git a/kdgantt/Makefile.am b/kdgantt/Makefile.am
index de319d12..81222706 100644
--- a/kdgantt/Makefile.am
+++ b/kdgantt/Makefile.am
@@ -16,7 +16,7 @@ libkdgantt_la_SOURCES = \
 			KDGanttXMLTools.cpp			\
 			itemAttributeDialog.ui
 libkdgantt_la_LDFLAGS = $(all_libraries) -no-undefined
-libkdgantt_la_LIBADD = $(LIB_KDEUI)
+libkdgantt_la_LIBADD = $(LIB_TDEUI)
 
 noinst_HEADERS =	\
 			KDGanttViewSubwidgets.h		\
diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am
index f2e60287..53348ac6 100644
--- a/kexi/formeditor/test/Makefile.am
+++ b/kexi/formeditor/test/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
 	-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \
 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes)
 
-kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
 
diff --git a/kexi/kexidb/Makefile.am b/kexi/kexidb/Makefile.am
index 8b4195e2..fc887a69 100644
--- a/kexi/kexidb/Makefile.am
+++ b/kexi/kexidb/Makefile.am
@@ -53,7 +53,7 @@ transaction.h \
 utils.h \
 parser/parser.h
 
-libkexidb_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) \
+libkexidb_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) \
 	 $(top_builddir)/kexi/kexiutils/libkexiutils.la
 libkexidb_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)
 
diff --git a/kexi/kexidb/parser/Makefile.am b/kexi/kexidb/parser/Makefile.am
index 31cfbc1c..91656790 100644
--- a/kexi/kexidb/parser/Makefile.am
+++ b/kexi/kexidb/parser/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/kexi/Makefile.global
 
 lib_LTLIBRARIES = libkexidbparser.la
 libkexidbparser_la_SOURCES = sqlscanner.cpp sqlparser.cpp parser.cpp parser_p.cpp
-libkexidbparser_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) ../libkexidb.la
+libkexidbparser_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) ../libkexidb.la
 libkexidbparser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)
 
 noinst_HEADERS = parser_p.h
diff --git a/kexi/kexiutils/Makefile.am b/kexi/kexiutils/Makefile.am
index 602e2321..dd506ef8 100644
--- a/kexi/kexiutils/Makefile.am
+++ b/kexi/kexiutils/Makefile.am
@@ -14,7 +14,7 @@ libkexiutils_la_LDFLAGS = \
   $(KDE_RPATH) $(all_libraries) \
   $(VER_INFO) -Wnounresolved -no-undefined
 
-libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_KDEUI) $(LIB_KIO) 
+libkexiutils_la_LIBADD = $(LIB_QT) $(LIB_TDEUI) $(LIB_KIO) 
 
 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)
 
diff --git a/kexi/main/Makefile.am b/kexi/main/Makefile.am
index 8786c7cf..ca95b8ea 100644
--- a/kexi/main/Makefile.am
+++ b/kexi/main/Makefile.am
@@ -18,7 +18,7 @@ libkeximain_la_LIBADD =  $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir
 	$(top_builddir)/kexi/main/printing/libkeximainprinting.la \
 	$(top_builddir)/lib/koproperty/libkoproperty.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
-	$(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(LIB_KDEPRINT)
+	$(LIB_KFEEDBACK) $(LIB_KEXI_KMDI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(LIB_TDEPRINT)
 
 #disabled	../migration/libkeximigrate.la
 
diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am
index 92002661..b122af83 100644
--- a/kexi/migration/Makefile.am
+++ b/kexi/migration/Makefile.am
@@ -31,7 +31,7 @@ libkeximigrate_la_LIBADD = \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/main/libkeximain.la \
-	$(LIB_QT) $(LIB_KDECORE)
+	$(LIB_QT) $(LIB_TDECORE)
 
 libkeximigrate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO)
 
@@ -51,7 +51,7 @@ keximigratetest_LDADD = libkeximigrate.la \
 	$(top_builddir)/kexi/kexidb/libkexidb.la \
 	$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
 	$(top_builddir)/kexi/main/libkeximain.la \
-	$(LIB_QT) $(LIB_KDECORE)
+	$(LIB_QT) $(LIB_TDECORE)
 
-keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/plugins/macros/kexiactions/Makefile.am b/kexi/plugins/macros/kexiactions/Makefile.am
index 4f42e5e9..b61cbcd3 100644
--- a/kexi/plugins/macros/kexiactions/Makefile.am
+++ b/kexi/plugins/macros/kexiactions/Makefile.am
@@ -16,7 +16,7 @@ libkeximacroactions_la_LDFLAGS = $(all_libraries)
 libkeximacroactions_la_LIBADD = \
     $(top_builddir)/kexi/plugins/macros/lib/libkomacro.la \
     $(top_builddir)/kexi/core/libkexicore.la \
-    $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+    $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 libkeximacroactions_la_METASOURCES = AUTO
 SUBDIRS = .
diff --git a/kexi/plugins/macros/lib/Makefile.am b/kexi/plugins/macros/lib/Makefile.am
index fc7867b8..4540f2f4 100644
--- a/kexi/plugins/macros/lib/Makefile.am
+++ b/kexi/plugins/macros/lib/Makefile.am
@@ -16,7 +16,7 @@ libkomacro_la_SOURCES = \
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
 libkomacro_la_LDFLAGS = $(all_libraries) -Wnounresolved
-libkomacro_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+libkomacro_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 libkomacro_la_METASOURCES = AUTO
 SUBDIRS = .
diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index fb556f0b..adb6a4d3 100644
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@@ -7,13 +7,13 @@ endif
 bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)
 
 komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
+komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
 
 if include_kunittestgui
   komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-  komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
+  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+  komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_TDEUI) $(LIB_KPARTS)
 endif
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
diff --git a/kexi/plugins/scripting/kexiapp/Makefile.am b/kexi/plugins/scripting/kexiapp/Makefile.am
index a2702a26..53ac4e88 100644
--- a/kexi/plugins/scripting/kexiapp/Makefile.am
+++ b/kexi/plugins/scripting/kexiapp/Makefile.am
@@ -12,7 +12,7 @@ krosskexiapp_la_SOURCES = \
 krosskexiapp_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
 krosskexiapp_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     $(LIB_KROSS_API) \
     $(LIB_KROSS_MAIN) \
     $(top_builddir)/kexi/core/libkexicore.la
diff --git a/kexi/plugins/scripting/kexidb/Makefile.am b/kexi/plugins/scripting/kexidb/Makefile.am
index a1a8c51e..2426062c 100644
--- a/kexi/plugins/scripting/kexidb/Makefile.am
+++ b/kexi/plugins/scripting/kexidb/Makefile.am
@@ -20,7 +20,7 @@ krosskexidb_la_SOURCES = \
 krosskexidb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkio
 krosskexidb_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     $(LIB_KROSS_API) \
     $(LIB_KROSS_MAIN) \
     $(top_builddir)/kexi/kexidb/libkexidb.la \
diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am
index 0dd60655..6f3d47df 100644
--- a/kexi/tests/altertable/Makefile.am
+++ b/kexi/tests/altertable/Makefile.am
@@ -13,10 +13,10 @@ SUBDIRS = .
 METASOURCES = AUTO
 
 kexialtertabletest_SOURCES = altertable.cpp
-kexialtertabletest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexialtertabletest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/kexiutils/libkexiutils.la \
  $(top_builddir)/kexi/main/libkeximain.la \
  $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am
index 98c6a168..940e7c16 100644
--- a/kexi/tests/newapi/Makefile.am
+++ b/kexi/tests/newapi/Makefile.am
@@ -16,17 +16,17 @@ SUBDIRS = .
 METASOURCES = AUTO
 
 kexidbtest_SOURCES = main.cpp
-kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexidbtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
  ../../kexidb/parser/libkexidbparser.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable
+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable
 
 #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
-#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 # ../../kexidb/parser/libkexidbparser.la
-#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp
-#kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
-#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
+#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/tests/parser/Makefile.am b/kexi/tests/parser/Makefile.am
index ec1a3441..6068e2c4 100644
--- a/kexi/tests/parser/Makefile.am
+++ b/kexi/tests/parser/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = kexidbparser
 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)
 
 kexidbparser_SOURCES = main.cpp
-kexidbparser_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la  $(all_libraries)
+kexidbparser_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la  $(all_libraries)
 kexidbparser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) --no-undefined
 
 
diff --git a/kexi/tests/startup/Makefile.am b/kexi/tests/startup/Makefile.am
index ab6cc9c5..0596a74a 100644
--- a/kexi/tests/startup/Makefile.am
+++ b/kexi/tests/startup/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = .
 METASOURCES = AUTO
 
 kexistartuptest_SOURCES = main.cpp
-kexistartuptest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
+kexistartuptest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/core/libkexicore.la \
  $(all_libraries)
 
diff --git a/kexi/tests/tableview/Makefile.am b/kexi/tests/tableview/Makefile.am
index 714b5a62..d6c097cd 100644
--- a/kexi/tests/tableview/Makefile.am
+++ b/kexi/tests/tableview/Makefile.am
@@ -11,6 +11,6 @@ SUBDIRS = .
 METASOURCES = AUTO
 
 kexitableviewtest_SOURCES = main.cpp
-kexitableviewtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(all_libraries)
+kexitableviewtest_LDADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(all_libraries)
 kexitableviewtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(VER_INFO) --no-undefined
 
diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am
index 815873a4..bfdd4f6b 100644
--- a/kexi/tests/widgets/Makefile.am
+++ b/kexi/tests/widgets/Makefile.am
@@ -5,10 +5,10 @@ noinst_PROGRAMS = kexidbdrivercombotest
 INCLUDES = -I$(top_srcdir)/kexi $(all_includes)
 
 kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp
-kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_KDECORE) \
+kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_TDECORE) \
  $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/kexi/widget/Makefile.am b/kexi/widget/Makefile.am
index 95dc30dd..70c75203 100644
--- a/kexi/widget/Makefile.am
+++ b/kexi/widget/Makefile.am
@@ -15,7 +15,7 @@ libkexiextendedwidgets_la_SOURCES = kexidataawareview.cpp \
 	kexiprjtypeselectorbase.ui kexiprjtypeselector.cpp
 
 libkexiextendedwidgets_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-libkexiextendedwidgets_la_LIBADD = $(LIB_KDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -lktexteditor
+libkexiextendedwidgets_la_LIBADD = $(LIB_TDEUI) ./utils/libkexiguiutils.la tableview/libkexidatatable.la ../core/libkexicore.la -lktexteditor
 
 SUBDIRS = utils tableview .  relations
 
diff --git a/kexi/widget/tableview/Makefile.am b/kexi/widget/tableview/Makefile.am
index 69bb400d..f1fc509f 100644
--- a/kexi/widget/tableview/Makefile.am
+++ b/kexi/widget/tableview/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = kexitableview_p.h
 
 libkexidatatable_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
 libkexidatatable_la_LIBADD =  $(top_builddir)/kexi/core/libkexicore.la $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
-	$(top_builddir)/lib/koproperty/libkoproperty.la $(LIB_KDEUI)
+	$(top_builddir)/lib/koproperty/libkoproperty.la $(LIB_TDEUI)
 
 #TODO: remove libkexicore link when kexiutils arrive
 
diff --git a/kexi/widget/utils/Makefile.am b/kexi/widget/utils/Makefile.am
index 5d210f1a..e06d9cd9 100644
--- a/kexi/widget/utils/Makefile.am
+++ b/kexi/widget/utils/Makefile.am
@@ -7,7 +7,7 @@ libkexiguiutils_la_SOURCES = kexisharedactionclient.cpp kexirecordnavigator.cpp
 	kexidropdownbutton.cpp kexicomboboxdropdownbutton.cpp kexicontextmenuutils.cpp
 
 libkexiguiutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-libkexiguiutils_la_LIBADD = $(LIB_KDEUI)
+libkexiguiutils_la_LIBADD = $(LIB_TDEUI)
 
 SUBDIRS = .
 
diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h
index 05d6f68f..3f9b894d 100644
--- a/kexi/widget/utils/kexigradientwidget.h
+++ b/kexi/widget/utils/kexigradientwidget.h
@@ -56,7 +56,7 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget {
 
 		/*!
 		Gradient type specification.
-		See GradientType for more details (part of the KDEFX library)
+		See GradientType for more details (part of the TDEFX library)
 		*/
 		enum GradientType {
 			VerticalGradient = KImageEffect::VerticalGradient,
diff --git a/kspread/plugins/scripting/kspreadcore/CMakeLists.txt b/kspread/plugins/scripting/kspreadcore/CMakeLists.txt
index 50cd0a73..823d9b3b 100644
--- a/kspread/plugins/scripting/kspreadcore/CMakeLists.txt
+++ b/kspread/plugins/scripting/kspreadcore/CMakeLists.txt
@@ -17,7 +17,7 @@ kde4_add_plugin(krosskspreadcore ${krosskspreadcore_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} krosskspreadcore )
 
-target_link_libraries(krosskspreadcore  ${KDE4_KDECORE_LIBS} krossapi krossmain kspreadcommon )
+target_link_libraries(krosskspreadcore  ${KDE4_TDECORE_LIBS} krossapi krossmain kspreadcommon )
 
 install(TARGETS krosskspreadcore  DESTINATION ${PLUGIN_INSTALL_DIR})
 
@@ -43,7 +43,7 @@ install(TARGETS krosskspreadcore  DESTINATION ${PLUGIN_INSTALL_DIR})
 #krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 #krosskspreadcore_la_LIBADD = \
 #    $(LIB_QT) \
-#    $(LIB_KDECORE) \
+#    $(LIB_TDECORE) \
 #    $(top_builddir)/lib/kross/api/libkrossapi.la \
 #    $(top_builddir)/lib/kross/main/libkrossmain.la \
 #    $(top_builddir)/kspread/libkspreadcommon.la
diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am
index 86bcded9..6bfe86f6 100644
--- a/kspread/plugins/scripting/kspreadcore/Makefile.am
+++ b/kspread/plugins/scripting/kspreadcore/Makefile.am
@@ -10,7 +10,7 @@ krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp kr
 krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui
 krosskspreadcore_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     $(top_builddir)/lib/kross/api/libkrossapi.la \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
     $(top_builddir)/kspread/libkspreadcommon.la
diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am
index 7db5b31a..753db18f 100644
--- a/kugar/kudesigner/Makefile.am
+++ b/kugar/kudesigner/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkudesignercore.la
 libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \
 	kudesigner_doc.cpp
 libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
-libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_KDEPRINT)
+libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_TDEPRINT)
 
 ## The part
 kde_module_LTLIBRARIES = libkudesignerpart.la
diff --git a/kugar/lib/Makefile.am b/kugar/lib/Makefile.am
index 0544d656..7bd50210 100644
--- a/kugar/lib/Makefile.am
+++ b/kugar/lib/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 METASOURCES = AUTO
 
-libkugarlib_la_LIBADD = $(LIB_QT) $(LIB_KDEPRINT)
+libkugarlib_la_LIBADD = $(LIB_QT) $(LIB_TDEPRINT)
 
 libkugarlib_la_LDFLAGS = $(all_libraries) -version-info 1:2 -no-undefined
 
diff --git a/kugar/part/Makefile.am b/kugar/part/Makefile.am
index 7c06e335..6f908841 100644
--- a/kugar/part/Makefile.am
+++ b/kugar/part/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES =
 kde_module_LTLIBRARIES = libkugarpart.la
 libkugarpart_la_SOURCES = kugar_part.cpp kugar_factory.cpp kugar_view.cpp
 libkugarpart_la_LDFLAGS = $(all_libraries) -module -avoid-version
-libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KOFFICECORE)
+libkugarpart_la_LIBADD = ../lib/libkugarlib.la $(LIB_KPARTS) $(LIB_TDEPRINT) $(LIB_KOFFICECORE)
 
 libkugarpart_la_METASOURCES = AUTO
 
diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am
index 2239437e..497897cc 100644
--- a/kword/mailmerge/Makefile.am
+++ b/kword/mailmerge/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la
 ## Plugin encapsulating the (old) internally stored style
 kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp
 kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore
-kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT)
+kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KOTEXT)
 
 METASOURCES = AUTO
 
diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am
index 4e49b615..de7f026c 100644
--- a/kword/mailmerge/kabc/Makefile.am
+++ b/kword/mailmerge/kabc/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la
 ## Plugin encapsulating the QT SQL database interface
 kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui
 kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC)
+kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_TDEUI) $(LIB_KABC)
 
 METASOURCES = AUTO
 
diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am
index 5596cc85..dfb5e2d6 100644
--- a/kword/mailmerge/kspread/Makefile.am
+++ b/kword/mailmerge/kspread/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kspread.la
 kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp
 kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
 kwmailmerge_kspread_la_LIBADD = ../../libkwmailmerge_interface.la \
-                                $(top_builddir)/kspread/libkspreadcommon.la $(LIB_KDEUI)
+                                $(top_builddir)/kspread/libkspreadcommon.la $(LIB_TDEUI)
 
 METASOURCES = AUTO
 
diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am
index 77afd962..4dd4816c 100644
--- a/kword/mailmerge/sql/Makefile.am
+++ b/kword/mailmerge/sql/Makefile.am
@@ -7,13 +7,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la
 kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \
 				 KWQtSqlEasyFilter.cpp
 kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
+kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
 kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h
 
 ## 2. Plugin encapsulating the QT SQL database interface
 kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel
 kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI)
+kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_TDEUI)
 kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h
 
 # Common files
diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am
index eb795cc3..4ad27bcc 100644
--- a/lib/kformula/Makefile.am
+++ b/lib/kformula/Makefile.am
@@ -26,7 +26,7 @@ libkformulalib_la_SOURCES	= basicelement.cc contextstyle.cc formulacursor.cc \
 #	kformuladefs.h kformulaconfigpage.h
 
 libkformulalib_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined $(KDE_RPATH)
-libkformulalib_la_LIBADD  = $(LIB_KDEUI) $(LIB_KOTEXT)
+libkformulalib_la_LIBADD  = $(LIB_TDEUI) $(LIB_KOTEXT)
 
 libkformulalib_la_METASOURCES = AUTO
 
diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index 2312578d..681995b7 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . tests
 KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
 INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
 libkofficecore_la_LIBADD  = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
-	$(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF)
+	$(LIB_TDEPRINT) $(LIB_KABC) $(LIB_KWMF)
 
 ####### Files
 
diff --git a/lib/koproperty/Makefile.am b/lib/koproperty/Makefile.am
index 654debd3..90ead373 100644
--- a/lib/koproperty/Makefile.am
+++ b/lib/koproperty/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/editors -I$(top_srcdir)/lib/kofficecore $(all_includes)
 
 lib_LTLIBRARIES =  libkoproperty.la
 
-libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la
+libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la
 libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0
 libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \
 	editoritem.cpp factory.cpp widget.cpp
diff --git a/lib/koproperty/editors/Makefile.am b/lib/koproperty/editors/Makefile.am
index 461fbc00..f617a19f 100644
--- a/lib/koproperty/editors/Makefile.am
+++ b/lib/koproperty/editors/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes)
 
 noinst_LTLIBRARIES =  libkopropertyeditors.la
-libkopropertyeditors_la_LIBADD =  $(LIB_KDEUI) $(LIB_KIO)
+libkopropertyeditors_la_LIBADD =  $(LIB_TDEUI) $(LIB_KIO)
 libkopropertyeditors_la_LDFLAGS = -Wno-unresolved $(all_libraries)
 libkopropertyeditors_la_SOURCES = booledit.cpp coloredit.cpp combobox.cpp cursoredit.cpp dateedit.cpp \
 	datetimeedit.cpp dummywidget.cpp fontedit.cpp linestyledit.cpp pixmapedit.cpp pointedit.cpp \
diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am
index edd3885b..22bacaa6 100644
--- a/lib/koproperty/test/Makefile.am
+++ b/lib/koproperty/test/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 noinst_PROGRAMS = propertytest
 
 propertytest_SOURCES = main.cpp test.cpp
-propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 propertytest_LDADD = $(LIB_KOPROPERTY)
 
 # this is where the shell's XML-GUI resource file goes
diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am
index 915423c2..724b0257 100644
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = hnjalloc.h hyphen.h kohyphen.h
 
 noinst_LTLIBRARIES = libkohyphen.la
 libkohyphen_la_SOURCES = hnjalloc.c hyphen.c kohyphen.cpp
-libkohyphen_la_LIBADD = $(LIB_KDECORE)
+libkohyphen_la_LIBADD = $(LIB_TDECORE)
 libkohyphen_la_LDFLAGS = $(all_libraries) -no-undefined
 
 dictsdir = $(kde_datadir)/koffice/hyphdicts
@@ -17,5 +17,5 @@ SUBDIRS = . hyphdicts
 check_PROGRAMS = kohyphentest
 
 kohyphentest_SOURCES = kohyphentest.cpp
-kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE)
-kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_TDECORE)
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am
index 14c6f7a0..d5cf50a2 100644
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
 TESTS = kotextformattertest kovariabletest
 
 LDADD = ../libkotext.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kobordertest_SOURCES = kobordertest.cpp
 kotextformattertest_SOURCES = kotextformattertest.cpp
diff --git a/lib/kross/api/Makefile.am b/lib/kross/api/Makefile.am
index 166e1bfa..7cc93ba8 100644
--- a/lib/kross/api/Makefile.am
+++ b/lib/kross/api/Makefile.am
@@ -40,7 +40,7 @@ libkrossapi_la_SOURCES = \
     interpreter.cpp
 
 libkrossapi_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
-libkrossapi_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+libkrossapi_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
 
 METASOURCES = AUTO
 SUBDIRS = .
diff --git a/lib/kross/main/Makefile.am b/lib/kross/main/Makefile.am
index 0ab90117..4072718a 100644
--- a/lib/kross/main/Makefile.am
+++ b/lib/kross/main/Makefile.am
@@ -21,9 +21,9 @@ maininclude_HEADERS = \
 
 libkrossmain_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     $(LIB_KFILE) \
-    $(LIB_KDEUI) \
+    $(LIB_TDEUI) \
     $(LIB_KNEWSTUFF) \
     $(LIB_KROSS_API)
 
diff --git a/lib/kross/python/Makefile.am b/lib/kross/python/Makefile.am
index 5eff2abe..743b3e0c 100644
--- a/lib/kross/python/Makefile.am
+++ b/lib/kross/python/Makefile.am
@@ -23,7 +23,7 @@ krosspython_la_SOURCES = \
 
 krosspython_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     cxx/libkrosspythoncxx.la \
     ../api/libkrossapi.la \
     ../main/libkrossmain.la
diff --git a/lib/kross/ruby/Makefile.am b/lib/kross/ruby/Makefile.am
index fb8ddfac..1a06e7a4 100644
--- a/lib/kross/ruby/Makefile.am
+++ b/lib/kross/ruby/Makefile.am
@@ -8,7 +8,7 @@ krossruby_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(RUBY_LIBRUBYARG) -module
 
 krossruby_la_LIBADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
+    $(LIB_TDECORE) \
     ../api/libkrossapi.la \
     ../main/libkrossmain.la
 
diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am
index 4de9bed7..1b2c9357 100644
--- a/lib/kross/runner/Makefile.am
+++ b/lib/kross/runner/Makefile.am
@@ -4,8 +4,8 @@ include $(top_srcdir)/lib/kross/Makefile.global
 bin_PROGRAMS = krossrunner
 
 krossrunner_SOURCES = main.cpp
-krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
+krossrunner_LDADD = $(LIB_QT) $(LIB_TDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am
index 04fa1c71..09e51e74 100644
--- a/lib/kross/test/Makefile.am
+++ b/lib/kross/test/Makefile.am
@@ -6,12 +6,12 @@ krosstest_SOURCES = testobject.cpp testaction.cpp testplugin.cpp testwindow.cpp
 
 krosstest_LDADD = \
     $(LIB_QT) \
-    $(LIB_KDECORE) \
-    $(LIB_KDEUI) \
+    $(LIB_TDECORE) \
+    $(LIB_TDEUI) \
     ../api/libkrossapi.la \
     ../main/libkrossmain.la
 
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am
index a7af75d4..4387792f 100644
--- a/lib/kwmf/Makefile.am
+++ b/lib/kwmf/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
 libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
 # We use tdecore for kdDebug :)
-libkwmf_la_LIBADD = $(LIB_KDECORE)
+libkwmf_la_LIBADD = $(LIB_TDECORE)
 
 ####### Files
 
@@ -16,4 +16,4 @@ noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfs
 
 libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
 libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
-libkowmf_la_LIBADD = $(LIB_KDECORE)
+libkowmf_la_LIBADD = $(LIB_TDECORE)
diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am
index 14153c3e..fe65dec1 100644
--- a/tools/converter/Makefile.am
+++ b/tools/converter/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 bin_PROGRAMS = koconverter
 koconverter_SOURCES = koconverter.cpp
-koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la
 
 METASOURCES = AUTO