Additional k => tde renaming and fixes

5 files changed, 14 insertions, 14 deletions

diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index ff334a4d4..853e3459e 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
 
 bin_PROGRAMS = korganizer
 
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 korganizer_LDADD   = libkorganizer.la
 korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
 korganizer_COMPILE_FIRST = koprefs_base.h
@@ -29,20 +29,20 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.
 kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h 	kogroupwareprefspage.h
 
 libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
+libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
 libkorganizerpart_la_SOURCES = korganizer_part.cpp
 libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
 
 
 check_PROGRAMS = korgplugins timezone
 
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-korgplugins_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+korgplugins_LDADD   = libkorganizer.la $(LIB_TDESYCOCA)
 korgplugins_SOURCES = korgplugins.cpp
 korgplugins_COMPILE_FIRST = koprefs_base.h
 
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-timezone_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+timezone_LDADD   = libkorganizer.la $(LIB_TDESYCOCA)
 timezone_SOURCES = timezone.cpp
 timezone_COMPILE_FIRST = koprefs_base.h
 
@@ -62,7 +62,7 @@ libkorganizer_la_LIBADD  = \
 	$(top_builddir)/libemailfunctions/libemailfunctions.la \
 	$(top_builddir)/libkholidays/libkholidays.la \
 	$(top_builddir)/libkmime/libkmime.la \
-	$(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \
+	$(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_KNEWSTUFF) \
 	-ltdeprint -ltdeabc -ltdeutils
 
 libkorganizer_la_COMPILE_FIRST = \
@@ -116,14 +116,14 @@ libkorganizer_la_SOURCES = komessagebox.cpp \
 
 libkorganizer_eventviewer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
                                        -no-undefined -version-info 1:0
-libkorganizer_eventviewer_la_LIBADD  = $(LIB_KPARTS) \
+libkorganizer_eventviewer_la_LIBADD  = $(LIB_TDEPARTS) \
                                        $(top_builddir)/libkcal/libkcal.la
 libkorganizer_eventviewer_la_SOURCES = koeventviewer.cpp urihandler.cpp \
                                        kmailIface.stub koeventviewerdialog.cpp
 
 libkorganizer_calendar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
                                     -no-undefined -version-info 1:0
-libkorganizer_calendar_la_LIBADD  = $(LIB_KPARTS) \
+libkorganizer_calendar_la_LIBADD  = $(LIB_TDEPARTS) \
                                     $(top_builddir)/libtdepim/libtdepim.la \
                                     $(top_builddir)/libkcal/libkcal.la
 libkorganizer_calendar_la_SOURCES = stdcalendar.cpp
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index 817cc95ff..910090627 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
 
 bin_PROGRAMS = korgac
 
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 korgac_LDADD   = $(LIB_TDEUI) \
                  $(top_builddir)/korganizer/libkorganizer_eventviewer.la
 korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
 
 check_PROGRAMS = testalarmdlg
 
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
                      $(top_builddir)/korganizer/libkorganizer_eventviewer.la
 testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am
index e022c354f..d1edf5baa 100644
--- a/korganizer/plugins/exchange/Makefile.am
+++ b/korganizer/plugins/exchange/Makefile.am
@@ -15,7 +15,7 @@ libkorg_exchange_la_SOURCES =  exchange.cpp exchangedialog.cpp exchangeconfig.cp
 libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
 libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \
 			     $(top_builddir)/libkpimexchange/libkpimexchange.la \
-			     $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
+			     $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
 			     $(top_builddir)/libkcal/libkcal.la
 
 noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h
diff --git a/korganizer/plugins/projectview/Makefile.am b/korganizer/plugins/projectview/Makefile.am
index f84cf7089..ef6b42ad1 100644
--- a/korganizer/plugins/projectview/Makefile.am
+++ b/korganizer/plugins/projectview/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkorg_projectview.la
 
 libkorg_projectview_la_SOURCES = projectview.cpp koprojectview.cpp
 libkorg_projectview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_projectview_la_LIBADD = $(top_builddir)/kgantt/kgantt/libkgantt.la $(top_builddir)/korganizer/libkorganizer.la $(LIB_KPARTS)
+libkorg_projectview_la_LIBADD = $(top_builddir)/kgantt/kgantt/libkgantt.la $(top_builddir)/korganizer/libkorganizer.la $(LIB_TDEPARTS)
 
 noinst_HEADERS = projectview.h koprojectview.h
 
diff --git a/korganizer/plugins/timespanview/Makefile.am b/korganizer/plugins/timespanview/Makefile.am
index a4431c6a5..1567c9b3b 100644
--- a/korganizer/plugins/timespanview/Makefile.am
+++ b/korganizer/plugins/timespanview/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkorg_timespanview.la
 
 libkorg_timespanview_la_SOURCES = lineview.cpp timeline.cpp timespanview.cpp timespanwidget.cpp kotimespanview.cpp
 libkorg_timespanview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_timespanview_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KPARTS)
+libkorg_timespanview_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_TDEPARTS)
 
 noinst_HEADERS = timespanview.h timespanwidget.h kotimespanview.h