7 files changed, 7 insertions, 7 deletions
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 9693b5259..613c186af 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -39,7 +39,7 @@
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
 #include <kmail/kmailicalIface.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 namespace KABC {
 
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 67ecac365..1f409069a 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/kresources/scalix/kioslave/CMakeLists.txt
index f210891ff..7ba76f672 100644
--- a/kresources/scalix/kioslave/CMakeLists.txt
+++ b/kresources/scalix/kioslave/CMakeLists.txt
@@ -32,6 +32,6 @@ install(
 
 tde_add_kpart( kio_scalix AUTOMOC
   SOURCES scalix.cpp
-  LINK kdepim-shared
+  LINK tdepim-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 36b2aa776..8b8c15c5c 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -28,7 +28,7 @@
 #include <kio/global.h>
 #include <klocale.h>
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 #include <stdlib.h>
 
diff --git a/kresources/scalix/knotes/Makefile.am b/kresources/scalix/knotes/Makefile.am
index f04c03940..56d7efe3e 100644
--- a/kresources/scalix/knotes/Makefile.am
+++ b/kresources/scalix/knotes/Makefile.am
@@ -12,7 +12,7 @@ libknotesscalix_la_LIBADD = \
 	$(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \
 	$(top_builddir)/knotes/libknotesresources.la \
 	$(top_builddir)/libkcal/libkcal.la \
-	-lkresources -lkdeprint
+	-lkresources -ltdeprint
 
 kde_module_LTLIBRARIES = knotes_scalix.la
 
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index fc1309b98..96b11b399 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -38,7 +38,7 @@
 #include <libkcal/calendarlocal.h>
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 
 namespace Scalix {
diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am
index fb748a0fb..ebde37e2e 100644
--- a/kresources/scalix/scalixadmin/Makefile.am
+++ b/kresources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
 
 INCLUDES = $(all_includes)
 
-scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 scalixadmin_LDADD   = $(LIB_KABC)
 scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
                       otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \