Rename additional instances of KDE to TDE

27 files changed, 40 insertions, 40 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 85f1606..6e1794d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2092,8 +2092,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")
@@ -2102,9 +2102,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")
@@ -2113,8 +2113,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")
@@ -2123,13 +2123,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/kipi-plugins/acquireimages/Makefile.am b/kipi-plugins/acquireimages/Makefile.am
index ba029c0..42c6806 100644
--- a/kipi-plugins/acquireimages/Makefile.am
+++ b/kipi-plugins/acquireimages/Makefile.am
@@ -8,7 +8,7 @@ kipiplugin_acquireimages_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_acquireimages_la_SOURCES = plugin_acquireimages.cpp acquireimagedialog.cpp screenshotdialog.cpp
 
 # Libs needed by the plugin
-kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_acquireimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/batchprocessimages/Makefile.am b/kipi-plugins/batchprocessimages/Makefile.am
index 6899f56..fb976dc 100644
--- a/kipi-plugins/batchprocessimages/Makefile.am
+++ b/kipi-plugins/batchprocessimages/Makefile.am
@@ -21,7 +21,7 @@ kipiplugin_batchprocessimages_la_SOURCES = plugin_batchprocessimages.cpp batchpr
 					   renameimagesbase.ui renameimageswidget.cpp
 
 # Libs needed by the plugin
-kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_batchprocessimages_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_batchprocessimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/calendar/Makefile.am b/kipi-plugins/calendar/Makefile.am
index 4094a88..a9df367 100644
--- a/kipi-plugins/calendar/Makefile.am
+++ b/kipi-plugins/calendar/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_calendar_la_SOURCES = plugin_calendar.cpp calwizard.cpp \
 		caltemplate.cpp calsettings.cpp calwidget.cpp calpainter.cpp calselect.cpp \
 		monthwidget.cpp calformatter.cpp calevents.cpp caleventsbase.ui
 
-kipiplugin_calendar_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_calendar_la_LIBADD = $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_calendar_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins -lkcal
 
diff --git a/kipi-plugins/cdarchiving/Makefile.am b/kipi-plugins/cdarchiving/Makefile.am
index 936a2cc..c507f8a 100644
--- a/kipi-plugins/cdarchiving/Makefile.am
+++ b/kipi-plugins/cdarchiving/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_cdarchiving_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_cdarchiving_la_SOURCES = plugin_cdarchiving.cpp cdarchivingdialog.cpp cdarchiving.cpp 
 
 # Libs needed by the plugin
-kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_cdarchiving_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/common/libkipiplugins/Makefile.am b/kipi-plugins/common/libkipiplugins/Makefile.am
index 718c336..f27551f 100644
--- a/kipi-plugins/common/libkipiplugins/Makefile.am
+++ b/kipi-plugins/common/libkipiplugins/Makefile.am
@@ -8,7 +8,7 @@ libkipiplugins_la_SOURCES = kpaboutdata.cpp
 
 libkipiplugins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 0:1:0 -no-undefined
 
-libkipiplugins_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+libkipiplugins_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes) 
 
diff --git a/kipi-plugins/findimages/Makefile.am b/kipi-plugins/findimages/Makefile.am
index b59f64a..605bf84 100644
--- a/kipi-plugins/findimages/Makefile.am
+++ b/kipi-plugins/findimages/Makefile.am
@@ -13,7 +13,7 @@ kipiplugin_findimages_la_SOURCES = plugin_findimages.cpp displaycompare.cpp \
 				   fuzzycompare.cpp fastcompare.cpp actions.cpp
 
 # Libs needed by the plugin
-kipiplugin_findimages_la_LIBADD = -ltdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_findimages_la_LIBADD = -ltdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_findimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/flickrexport/Makefile.am b/kipi-plugins/flickrexport/Makefile.am
index 90d64f4..912fc9d 100644
--- a/kipi-plugins/flickrexport/Makefile.am
+++ b/kipi-plugins/flickrexport/Makefile.am
@@ -12,7 +12,7 @@ kipiplugin_flickrexport_la_SOURCES = plugin_flickrexport.cpp imageslist.cpp \
 		                             flickrwidget.cpp mpform.cpp flickralbumdialog.ui \
 		                             flickrviewitem.cpp  
 
-kipiplugin_flickrexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_flickrexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_flickrexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/galleryexport/Makefile.am b/kipi-plugins/galleryexport/Makefile.am
index 838324a..f3c385e 100644
--- a/kipi-plugins/galleryexport/Makefile.am
+++ b/kipi-plugins/galleryexport/Makefile.am
@@ -14,7 +14,7 @@ kipiplugin_galleryexport_la_SOURCES = plugin_galleryexport.cpp \
 		galleryviewitem.cpp
 
 kipiplugin_galleryexport_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_galleryexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/gpssync/Makefile.am b/kipi-plugins/gpssync/Makefile.am
index c5fcc64..0f1c3fe 100644
--- a/kipi-plugins/gpssync/Makefile.am
+++ b/kipi-plugins/gpssync/Makefile.am
@@ -15,7 +15,7 @@ kipiplugin_gpssync_la_SOURCES = plugin_gpssync.cpp gpssyncdialog.cpp gpslistview
 
 # Libs needed by the plugin
 kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KHTML) \
-	                       $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
+	                       $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
 	                       $(LIB_KFILE)
 
 # LD flags for the plugin
diff --git a/kipi-plugins/helloworld/Makefile.am b/kipi-plugins/helloworld/Makefile.am
index 25258d4..4180bc1 100644
--- a/kipi-plugins/helloworld/Makefile.am
+++ b/kipi-plugins/helloworld/Makefile.am
@@ -8,7 +8,7 @@ kipiplugin_helloworld_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_helloworld_la_SOURCES = plugin_helloworld.cpp 
 
 # Libs needed by the plugin
-kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_helloworld_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_helloworld_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/htmlexport/Makefile.am b/kipi-plugins/htmlexport/Makefile.am
index e3254e3..2b7f8cb 100644
--- a/kipi-plugins/htmlexport/Makefile.am
+++ b/kipi-plugins/htmlexport/Makefile.am
@@ -27,7 +27,7 @@ kipiplugin_htmlexport_la_SOURCES = \
 kde_kcfg_DATA = \
 	htmlexportconfig.kcfg
 
-kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 kipiplugin_htmlexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 
diff --git a/kipi-plugins/imageviewer/Makefile.am b/kipi-plugins/imageviewer/Makefile.am
index 628c44f..9ccef61 100644
--- a/kipi-plugins/imageviewer/Makefile.am
+++ b/kipi-plugins/imageviewer/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kipiplugin_viewer.la
 
 kipiplugin_viewer_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKDCRAW_LIBS_DEP)
 kipiplugin_viewer_la_SOURCES = viewerwidget.cpp texture.cpp timer.cpp plugin_viewer.cpp help.ui
-kipiplugin_viewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lGL
+kipiplugin_viewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lGL
 kipiplugin_viewer_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
 
 kde_services_DATA = kipiplugin_viewer.desktop
diff --git a/kipi-plugins/ipodexport/Makefile.am b/kipi-plugins/ipodexport/Makefile.am
index 8d14a4f..439928f 100644
--- a/kipi-plugins/ipodexport/Makefile.am
+++ b/kipi-plugins/ipodexport/Makefile.am
@@ -15,7 +15,7 @@ kipiplugin_ipodexport_la_SOURCES = plugin_ipodexport.cpp \
                                    ipodlistitem.cpp \
                                    imagelist.cpp
 
-kipiplugin_ipodexport_la_LIBADD  = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_ipodexport_la_LIBADD  = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_ipodexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIBGPOD_LIBS) $(all_libraries)
 
diff --git a/kipi-plugins/jpeglossless/Makefile.am b/kipi-plugins/jpeglossless/Makefile.am
index a6ac81a..572ac3c 100644
--- a/kipi-plugins/jpeglossless/Makefile.am
+++ b/kipi-plugins/jpeglossless/Makefile.am
@@ -16,8 +16,8 @@ kipiplugin_jpeglossless_la_SOURCES = plugin_jpeglossless.cpp jpegtransform.cpp \
 	                             actionthread.cpp utils.cpp transupp.cpp \
 	                             imagerotate.cpp convert2grayscale.cpp imageflip.cpp 
 
-kipiplugin_jpeglossless_la_LIBADD = -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KDEUI) \
-	                            $(LIBKDCRAW_LIBS) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_jpeglossless_la_LIBADD = -ljpeg $(LIBKIPI_LIBS) $(LIBKEXIV2_LIBS) $(LIB_TDEUI) \
+	                            $(LIBKDCRAW_LIBS) $(LIB_TDECORE) $(LIB_QT)
 
 
 kipiplugin_jpeglossless_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/kameraklient/Makefile.am b/kipi-plugins/kameraklient/Makefile.am
index 6696144..7103dbc 100644
--- a/kipi-plugins/kameraklient/Makefile.am
+++ b/kipi-plugins/kameraklient/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kipiplugin_kameraklient.la
 kipiplugin_kameraklient_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 
-kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_kameraklient_la_LIBADD = $(LIB_GPHOTO) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_kameraklient_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/metadataedit/Makefile.am b/kipi-plugins/metadataedit/Makefile.am
index 6f4a63b..f54236c 100644
--- a/kipi-plugins/metadataedit/Makefile.am
+++ b/kipi-plugins/metadataedit/Makefile.am
@@ -19,7 +19,7 @@ kipiplugin_metadataedit_la_SOURCES = plugin_metadataedit.cpp metadatacheckbox.cp
 
 # Libs needed by the plugin
 kipiplugin_metadataedit_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	       -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+	       -lkipiplugins $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_metadataedit_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/mpegencoder/Makefile.am b/kipi-plugins/mpegencoder/Makefile.am
index 8b841c6..38558c7 100644
--- a/kipi-plugins/mpegencoder/Makefile.am
+++ b/kipi-plugins/mpegencoder/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_mpegencoder_la_SOURCES = plugin_mpegencoder.cpp kimg2mpgbase.ui\
                                        optionsdialog.cpp checkbinprog.cpp
 
 # Libs needed by the plugin
-kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) 
+kipiplugin_mpegencoder_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) 
 
 # LD flags for the plugin
 kipiplugin_mpegencoder_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/picasawebexport/Makefile.am b/kipi-plugins/picasawebexport/Makefile.am
index 118921e..6b83fb4 100644
--- a/kipi-plugins/picasawebexport/Makefile.am
+++ b/kipi-plugins/picasawebexport/Makefile.am
@@ -12,7 +12,7 @@ kipiplugin_picasawebexport_la_SOURCES = plugin_picasawebexport.cpp \
 		                     picasawebwidget.cpp mpform.cpp picasawebviewitem.cpp \
 		                     PicasawebNewAlbumDialog.ui uploadwidget.ui
 
-kipiplugin_picasawebexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_picasawebexport_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_picasawebexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/printwizard/Makefile.am b/kipi-plugins/printwizard/Makefile.am
index abb7e57..99b205a 100644
--- a/kipi-plugins/printwizard/Makefile.am
+++ b/kipi-plugins/printwizard/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_printwizard_la_SOURCES = frmprintwizardbase.ui plugin_printwizard.cpp
 
 #LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
 kipiplugin_printwizard_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) -lkipiplugins \
-				   $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+				   $(LIB_TDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_printwizard_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) 
 
diff --git a/kipi-plugins/rawconverter/Makefile.am b/kipi-plugins/rawconverter/Makefile.am
index 159dcb1..fc1bc3c 100644
--- a/kipi-plugins/rawconverter/Makefile.am
+++ b/kipi-plugins/rawconverter/Makefile.am
@@ -16,7 +16,7 @@ kipiplugin_rawconverter_la_SOURCES = plugin_rawconverter.cpp rawdecodingiface.cp
 
 # Libs needed by the plugin
 kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) $(LIBKIPI_LIBS) \
-	                            $(LIB_TIFF) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+	                            $(LIB_TIFF) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_rawconverter_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/sendimages/Makefile.am b/kipi-plugins/sendimages/Makefile.am
index 77c576c..1d2f407 100644
--- a/kipi-plugins/sendimages/Makefile.am
+++ b/kipi-plugins/sendimages/Makefile.am
@@ -13,7 +13,7 @@ kipiplugin_sendimages_la_SOURCES = plugin_sendimages.cpp sendimagesdialog.cpp \
 
 # Libs needed by the plugin
 kipiplugin_sendimages_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIBKDCRAW_LIBS) \
-	                          $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+	                          $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_sendimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) \
diff --git a/kipi-plugins/simpleviewerexport/Makefile.am b/kipi-plugins/simpleviewerexport/Makefile.am
index 7acd502..051837a 100644
--- a/kipi-plugins/simpleviewerexport/Makefile.am
+++ b/kipi-plugins/simpleviewerexport/Makefile.am
@@ -9,7 +9,7 @@ kipiplugin_simpleviewer_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_D
 kipiplugin_simpleviewer_la_SOURCES = plugin_simpleviewer.cpp svedialog.cpp \
 	                                 simpleviewerexport.cpp firstrundlg.cpp
 
-kipiplugin_simpleviewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_simpleviewer_la_LIBADD = $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS) $(LIBKEXIV2_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_simpleviewer_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/slideshow/Makefile.am b/kipi-plugins/slideshow/Makefile.am
index f35f8b8..970b59d 100644
--- a/kipi-plugins/slideshow/Makefile.am
+++ b/kipi-plugins/slideshow/Makefile.am
@@ -13,9 +13,9 @@ kipiplugin_slideshow_la_SOURCES = listimageitems.cpp plugin_slideshow.cpp \
 	slideshowloader.cpp toolbar.cpp imageloadthread.cpp kbeffect.cpp screenproperties.cpp \
 	slideshowkb.cpp
 
-#kipiplugin_slideshow_la_LIBADD = -ltdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+#kipiplugin_slideshow_la_LIBADD = -ltdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 kipiplugin_slideshow_la_LIBADD = -ltdefx -lXrandr $(GL_LIBS) $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS)  \
-	                         $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT)
+	                         $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)
 
 kipiplugin_slideshow_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/sync/Makefile.am b/kipi-plugins/sync/Makefile.am
index 7a6d257..bfa8dd0 100644
--- a/kipi-plugins/sync/Makefile.am
+++ b/kipi-plugins/sync/Makefile.am
@@ -16,7 +16,7 @@ kipiplugin_sync_la_SOURCES = plugin_sync.cpp \
 		sinks/gallery/gallerycollection.cpp sinks/gallery/galleryitem.cpp
 
 kipiplugin_sync_la_LIBADD = $(LIBKEXIV2_LIBS) \
-	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+	-lkwalletclient $(LIB_KHTML) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_sync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
diff --git a/kipi-plugins/timeadjust/Makefile.am b/kipi-plugins/timeadjust/Makefile.am
index 66e9ade..0d0d16e 100644
--- a/kipi-plugins/timeadjust/Makefile.am
+++ b/kipi-plugins/timeadjust/Makefile.am
@@ -11,7 +11,7 @@ kipiplugin_timeadjust_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP
 kipiplugin_timeadjust_la_SOURCES = plugin_timeadjust.cpp timeadjustdialog.cpp
 
 # Libs needed by the plugin
-kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_timeadjust_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_timeadjust_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/wallpaper/Makefile.am b/kipi-plugins/wallpaper/Makefile.am
index 8d980d0..1c11d92 100644
--- a/kipi-plugins/wallpaper/Makefile.am
+++ b/kipi-plugins/wallpaper/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kipiplugin_wallpaper.la
 kipiplugin_wallpaper_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP)
 kipiplugin_wallpaper_la_SOURCES = plugin_wallpaper.cpp
 
-kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_wallpaper_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 
 kipiplugin_wallpaper_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)