14 files changed, 308 insertions, 430 deletions
diff --git a/conduits/CMakeLists.txt b/conduits/CMakeLists.txt
index e8f49e5..132fa0a 100644
--- a/conduits/CMakeLists.txt
+++ b/conduits/CMakeLists.txt
@@ -1,35 +1,11 @@
-include_directories(
-	${CMAKE_BINARY_DIR}/lib
-	${CMAKE_SOURCE_DIR}/lib
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-add_subdirectory(abbrowserconduit)
-add_subdirectory(docconduit)
-add_subdirectory(knotes)
-add_subdirectory(memofileconduit)
-add_subdirectory(notepadconduit)
-add_subdirectory(null)
-add_subdirectory(popmail)
-add_subdirectory(sysinfoconduit)
-add_subdirectory(timeconduit)
-
-FIND_PATH( HAVE_CALENDARLOCAL_H "libkcal/calendarlocal.h" ${KDE3_INCLUDE_DIR} )
-
-IF (HAVE_CALENDARLOCAL_H)
-	add_subdirectory(vcalconduit)
-ELSE (HAVE_CALENDARLOCAL_H)
-	MESSAGE(STATUS "No KDE PIM development headers were found.")
-ENDIF (HAVE_CALENDARLOCAL_H)
-
-###
-#
-# MAL seems to be broken, or the MAL API has changed somewhat
-# since the last time that the conduit was compiled by the development
-# team. Since we don't use the conduit it is disabled. 
-IF (MAL_FOUND)
- 	add_subdirectory(malconduit)
-ELSE (MAL_FOUND)
-	MESSAGE(STATUS "Couldn't find mal. Won't be able to build malconduit")
-ENDIF (MAL_FOUND)
-
+##### directories ###############################
+
+add_subdirectory( abbrowserconduit )
+add_subdirectory( docconduit )
+add_subdirectory( knotes )
+add_subdirectory( memofileconduit )
+add_subdirectory( notepadconduit )
+add_subdirectory( popmail )
+add_subdirectory( sysinfoconduit )
+add_subdirectory( timeconduit )
+add_subdirectory( vcalconduit )
diff --git a/conduits/abbrowserconduit/CMakeLists.txt b/conduits/abbrowserconduit/CMakeLists.txt
index e89c097..4784ec9 100644
--- a/conduits/abbrowserconduit/CMakeLists.txt
+++ b/conduits/abbrowserconduit/CMakeLists.txt
@@ -1,46 +1,39 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_abbrowser_SRCS
-	resolutionDialog.cc
-	abbrowser-factory.cc
-	abbrowser-setup.cc
-	tdeabcRecord.cc
-	abbrowser-conduit.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_abbrowser_UIS
-	resolutionDialog_base.ui
-	kaddressbookConduit.ui
-)
 
-set(conduit_abbrowser_KCFGS
-	abbrowserSettings.kcfgc
-)
+##### conduit_address (kpart) ###################
 
-kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
-trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
-trinity_automoc(${conduit_abbrowser_SRCS})
-add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
-target_link_libraries(conduit_address tdeabc_file tdeabc)
-set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_address AUTOMOC
+  SOURCES resolutionDialog_base.ui kaddressbookConduit.ui
+    abbrowserSettings.kcfgc resolutionDialog.cc abbrowser-factory.cc
+    abbrowser-setup.cc tdeabcRecord.cc abbrowser-conduit.cc
+  LINK kpilot-shared tdeabc-shared tdeabc_file-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_address)
 
-install(
-	TARGETS conduit_address
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES abbrowser_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES KPilotCustomFieldEditor.ui
+  DESTINATION ${DATA_INSTALL_DIR}/kaddressbook/contacteditorpages
 )
 
-install(
-	FILES abbrowserconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES abbrowser_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
+install( FILES abbrowserconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt
index f22df6e..3482a46 100644
--- a/conduits/docconduit/CMakeLists.txt
+++ b/conduits/docconduit/CMakeLists.txt
@@ -1,87 +1,63 @@
+
+add_subdirectory( Icons )
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(doc_shared_SRCS
-	makedoc9.cc
-	pilotDOCHead.cc
-	pilotDOCEntry.cc
-	pilotDOCBookmark.cc
-	DOC-converter.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_doc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-	doc-factory.cc
-	doc-setup.cc
-	doc-conduit.cc
-	doc-conflictdialog.cc
-)
 
-set(conduit_doc_UIS
-	kpalmdoc_dlgbase.ui
-	doc-setupdialog.ui
-)
+##### palmdoc (static) ##########################
 
-set(conduit_doc_KCFGS
-	docconduitSettings.kcfgc
-	kpalmdocSettings.kcfgc
+tde_add_library( palmdoc STATIC_PIC AUTOMOC
+  SOURCES makedoc9.cc pilotDOCHead.cc
+    pilotDOCEntry.cc pilotDOCBookmark.cc
+    DOC-converter.cc
 )
 
-kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
-trinity_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
-trinity_automoc(${conduit_doc_SRCS})
-add_library(conduit_doc SHARED ${conduit_doc_SRCS})
 
-kpilot_rpath(conduit_doc)
+##### kpalmdoc (executable) #####################
 
-set_target_properties(
-	conduit_doc PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
+tde_add_executable( kpalmdoc AUTOMOC
+  SOURCES kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc
+    kpalmdoc.cpp
+  LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared palmdoc-static
+  DESTINATION ${BIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_doc)
 
-install(
-	TARGETS conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### conduit_doc (kpart) #######################
 
-set(kpalmdoc_SRCS
-	${doc_shared_SRCS}
-	kpalmdoc_dlg.cc
-	kpalmdoc.cpp
-)
-kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
-trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
-trinity_automoc(${kpalmdoc_SRCS})
-add_executable(kpalmdoc ${kpalmdoc_SRCS})
-target_link_libraries(kpalmdoc ${TQT_LIBRARIES} kpilot tdeui tdeio)
-kpilot_rpath(kpalmdoc)
-
-install(
-	TARGETS kpalmdoc conduit_doc
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+tde_add_kpart( conduit_doc AUTOMOC
+  SOURCES docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc
+    doc-setupdialog.ui doc-conflictdialog.cc
+  LINK kpilot-shared tdeui-shared palmdoc-static
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-install(
-	FILES doc_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
-)
 
-install(
-	FILES docconduit.kcfg kpalmdoc.kcfg DESTINATION ${KDE3_KCFG_DIR}
+##### other data ################################
+
+install( FILES kpalmdoc.desktop
+  DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
-install(
-	FILES kpalmdoc.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
+install( FILES kpalmdoc.upd
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
 )
 
-install(
-	FILES kpalmdoc.upd
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
+install( FILES doc_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-add_subdirectory(Icons)
+install( FILES docconduit.kcfg kpalmdoc.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/conduits/docconduit/Icons/CMakeLists.txt b/conduits/docconduit/Icons/CMakeLists.txt
index 17d5a63..82510f4 100644
--- a/conduits/docconduit/Icons/CMakeLists.txt
+++ b/conduits/docconduit/Icons/CMakeLists.txt
@@ -1,3 +1,3 @@
+##### install icons #############################
 
-trinity_install_icons_custom( hicolor )
-
+tde_install_icons( kpalmdoc )
diff --git a/conduits/knotes/CMakeLists.txt b/conduits/knotes/CMakeLists.txt
index efdafbb..60941a0 100644
--- a/conduits/knotes/CMakeLists.txt
+++ b/conduits/knotes/CMakeLists.txt
@@ -1,52 +1,38 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_knotes_SRCS
-	knotes-factory.cc
-	knotes-setup.cc
-	knotes-action.cc
-)
 
-set(conduit_knotes_UIS
-	setup_base.ui
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_knotes_KCFGS
-	knotesconduitSettings.kcfgc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-#set(conduit_knotes_STUBS
-#	KNotesIface.h
-#)
-
-#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
-#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
+tde_import( libkmime )
+tde_import( ktnef )
+tde_import( libkcal )
 
-kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
-trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
-trinity_automoc(${conduit_knotes_SRCS})
 
-add_library(conduit_knotes SHARED ${conduit_knotes_SRCS})
-target_link_libraries(conduit_knotes kcal)
+##### conduit_knotes (kpart) ####################
 
-set_target_properties(conduit_knotes PROPERTIES
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_knotes AUTOMOC
+  SOURCES knotesconduitSettings.kcfgc knotes-factory.cc
+    knotes-setup.cc knotes-action.cc setup_base.ui
+  LINK kpilot-shared tdeui-shared kcal-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_knotes)
 
-install(
-	TARGETS conduit_knotes
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES knotes-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES knotes-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES knotesconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES knotesconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
diff --git a/conduits/malconduit/CMakeLists.txt b/conduits/malconduit/CMakeLists.txt
index 6064a22..a6ff252 100644
--- a/conduits/malconduit/CMakeLists.txt
+++ b/conduits/malconduit/CMakeLists.txt
@@ -1,48 +1,34 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-	${MAL_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_mal_SRCS
-	mal-factory.cc 
-	mal-setup.cc 
-	mal-conduit.cc 
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_mal_UIS
-	mal-setup_dialog.ui
-)
 
-set(conduit_mal_KCFGS
-	malconduitSettings.kcfgc
-)
+##### conduit_mal (kpart) #######################
 
-kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
-trinity_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
-trinity_automoc(${conduit_mal_SRCS})
-add_library(conduit_mal SHARED ${conduit_mal_SRCS})
-target_link_libraries(conduit_mal ${MAL_LIBRARY})
-
-set_target_properties(
-	conduit_mal PROPERTIES 
-	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
-	INSTALL_RPATH "${MAL_LIBRARY}"
-	INSTALL_RPATH_USE_LINK_PATH true
+tde_add_kpart( conduit_mal AUTOMOC
+  SOURCES malconduitSettings.kcfgc mal-setup_dialog.ui
+    mal-factory.cc mal-setup.cc mal-conduit.cc
+  LINK kpilot-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_mal)
 
-install(
-	TARGETS conduit_mal
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES mal_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES mal_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES malconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES malconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
-
diff --git a/conduits/memofileconduit/CMakeLists.txt b/conduits/memofileconduit/CMakeLists.txt
index bece12c..92a4bfe 100644
--- a/conduits/memofileconduit/CMakeLists.txt
+++ b/conduits/memofileconduit/CMakeLists.txt
@@ -1,44 +1,34 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_memofile_SRCS
-	memofile-factory.cc
-	memofile.cc
-	memofiles.cc
-	memofile-conduit.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_memofile_UIS
-	setup_base.ui
-)
 
-set(conduit_memofile_KCFGS
-	memofileSettings.kcfgc
-)
+##### conduit_memofile (kpart) ##################
 
-kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
-trinity_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
-trinity_automoc(${conduit_memofile_SRCS})
-add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
-
-set_target_properties(
-	conduit_memofile PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_memofile AUTOMOC
+  SOURCES memofileSettings.kcfgc setup_base.ui memofile-factory.cc
+    memofile.cc memofiles.cc memofile-conduit.cc
+  LINK kpilot-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_memofile)
 
-install(
-	TARGETS conduit_memofile
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES memofile-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES memofile-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES memofileconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES memofileconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
diff --git a/conduits/notepadconduit/CMakeLists.txt b/conduits/notepadconduit/CMakeLists.txt
index d654a6a..6d3ba8c 100644
--- a/conduits/notepadconduit/CMakeLists.txt
+++ b/conduits/notepadconduit/CMakeLists.txt
@@ -1,38 +1,30 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_notepad_SRCS
-	notepad-factory.cc
-	notepad-conduit.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_notepad_UIS
-	notepad-setup.ui
-)
 
-set(conduit_notepad_KCFGS
-	notepadconduit.kcfgc
-)
+##### conduit_notepad (kpart) ###################
 
-kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
-trinity_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
-trinity_automoc(${conduit_notepad_SRCS})
-add_library(conduit_notepad SHARED ${conduit_notepad_SRCS})
-
-set_target_properties(
-	conduit_notepad PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_notepad AUTOMOC
+  SOURCES notepadconduit.kcfgc notepad-setup.ui
+    notepad-conduit.cc notepad-factory.cc
+  LINK kpilot-shared tdeui-shared tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_notepad)
 
-install(
-	TARGETS conduit_notepad
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES notepad-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES notepad-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
diff --git a/conduits/null/CMakeLists.txt b/conduits/null/CMakeLists.txt
index 3b689e0..065779e 100644
--- a/conduits/null/CMakeLists.txt
+++ b/conduits/null/CMakeLists.txt
@@ -1,38 +1,33 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_null_SRCS
-	null-conduit.cc
-	null-factory.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_null_UIS
-	setup_base.ui
-)
 
-set(conduit_null_KCFGS
-	nullSettings.kcfgc
-)
+##### conduit_null (kpart) ######################
 
-kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
-trinity_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
-trinity_automoc(${conduit_null_SRCS})
-add_library(conduit_null SHARED ${conduit_null_SRCS})
-
-set_target_properties(
-	conduit_null PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_null AUTOMOC
+  SOURCES nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc
+  LINK kpilot-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_null)
 
-install(
-	TARGETS conduit_null
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
+##### other data ################################
+
+install( FILES null-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES null-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES nullconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
diff --git a/conduits/popmail/CMakeLists.txt b/conduits/popmail/CMakeLists.txt
index d2c63e9..c12e64a 100644
--- a/conduits/popmail/CMakeLists.txt
+++ b/conduits/popmail/CMakeLists.txt
@@ -1,43 +1,34 @@
+
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_popmail_SRCS
-	popmail-factory.cc
-	popmail-conduit.cc
-	setupDialog.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_popmail_UIS
-	setup-dialog.ui
-)
 
-set(conduit_popmail_KCFGS
-	popmailSettings.kcfgc
-)
+##### conduit_popmail (kpart) ###################
 
-kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
-trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
-trinity_automoc(${conduit_popmail_SRCS})
-add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
-
-set_target_properties(
-	conduit_popmail PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_popmail AUTOMOC
+  SOURCES popmailSettings.kcfgc setup-dialog.ui popmail-factory.cc
+    setupDialog.cc popmail-conduit.cc
+  LINK kpilot-shared tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_popmail)
 
-install(
-	TARGETS conduit_popmail
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES popmail-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES popmail-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES popmail.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES popmail.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
diff --git a/conduits/recordconduit/CMakeLists.txt b/conduits/recordconduit/CMakeLists.txt
new file mode 100644
index 0000000..a4aec62
--- /dev/null
+++ b/conduits/recordconduit/CMakeLists.txt
@@ -0,0 +1,33 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### conduit_record (kpart) ####################
+
+tde_add_kpart( conduit_record AUTOMOC
+  SOURCES settings.kcfgc setup_base.ui factory.cc
+  LINK kpilot-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data ################################
+
+install( FILES record-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install( FILES settings.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/conduits/sysinfoconduit/CMakeLists.txt b/conduits/sysinfoconduit/CMakeLists.txt
index 99b862c..10f85e5 100644
--- a/conduits/sysinfoconduit/CMakeLists.txt
+++ b/conduits/sysinfoconduit/CMakeLists.txt
@@ -1,50 +1,38 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
 
-set(conduit_sysinfo_SRCS
-	sysinfo-setup.cc
-	sysinfo-factory.cc
-	sysinfo-conduit.cc
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_sysinfo_UIS
-	sysinfo-setup_dialog.ui
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-set(conduit_sysinfo_KCFGS
-	sysinfoSettings.kcfgc
-)
 
-kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
-trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
-trinity_automoc(${conduit_sysinfo_SRCS})
-add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
+##### conduit_sysinfo (kpart) ###################
 
-set_target_properties(
-	conduit_sysinfo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+tde_add_kpart( conduit_sysinfo AUTOMOC
+  SOURCES sysinfoSettings.kcfgc sysinfo-factory.cc sysinfo-setup.cc
+    sysinfo-conduit.cc sysinfo-setup_dialog.ui
+  LINK kpilot-shared tdeui-shared tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_sysinfo)
 
-install(
-	TARGETS conduit_sysinfo
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES sysinfo_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES Template.html Template.txt
+  DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sysinfoconduit
 )
 
-install(
-	FILES sysinfoSettings.kcfgc sysinfoconduit.kcfg
-	DESTINATION ${KDE3_KCFG_DIR}
+install( FILES sysinfo_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES Template.html Template.txt 
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/sysinfoconduit
+install( FILES sysinfoconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
-
diff --git a/conduits/timeconduit/CMakeLists.txt b/conduits/timeconduit/CMakeLists.txt
index abf1e27..6392387 100644
--- a/conduits/timeconduit/CMakeLists.txt
+++ b/conduits/timeconduit/CMakeLists.txt
@@ -1,44 +1,34 @@
-include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set(conduit_time_SRCS
-	time-conduit.cc
-	time-factory.cc
-	time-setup.cc
-)
 
-set(conduit_time_UIS
-	time-setup_dialog.ui
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_time_KCFGS
-	timeConduitSettings.kcfgc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
-trinity_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
-trinity_automoc(${conduit_time_SRCS})
-add_library(conduit_time SHARED ${conduit_time_SRCS})
 
-kpilot_rpath(conduit_time)
+##### conduit_time (kpart) ######################
 
-set_target_properties(
-	conduit_time PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	PREFIX ""
+tde_add_kpart( conduit_time AUTOMOC
+  SOURCES timeConduitSettings.kcfgc time-factory.cc time-setup.cc
+    time-conduit.cc time-setup_dialog.ui
+  LINK kpilot-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_time)
 
-install(
-	TARGETS conduit_time
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-)
+##### other data ################################
 
-install(
-	FILES time_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
+install( FILES time_conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES timeconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES timeconduit.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )
diff --git a/conduits/vcalconduit/CMakeLists.txt b/conduits/vcalconduit/CMakeLists.txt
index 40808bc..22d8664 100644
--- a/conduits/vcalconduit/CMakeLists.txt
+++ b/conduits/vcalconduit/CMakeLists.txt
@@ -1,75 +1,57 @@
-set(conduit_LIBS kcal)
 
 include_directories(
-	${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
 )
 
-set(conduit_SHARED
-	vcal-setupbase.cc
-	vcal-conduitbase.cc
-	teststate.cc
-	initstate.cc
-	pctohhstate.cc
-	hhtopcstate.cc
-	cleanupstate.cc
-	deleteunsyncedpcstate.cc
-	deleteunsyncedhhstate.cc
-	kcalRecord.cc
-	vcalRecord.cc
-	todoRecord.cc
+link_directories(
+  ${TQT_LIBRARY_DIRS}
 )
 
-kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
-trinity_add_ui_files(conduit_SHARED korganizerConduit.ui)
+tde_import( libkmime )
+tde_import( ktnef )
+tde_import( libkcal )
 
-set(conduit_vcal_SRCS
-	${conduit_SHARED}
-	vcal-conduit.cc
-	vcal-factory.cc
-	vcal-setup.cc
-)
 
-trinity_automoc(${conduit_vcal_SRCS})
-add_library(conduit_vcal SHARED ${conduit_vcal_SRCS})
-target_link_libraries(conduit_vcal kcal)
+##### vcalconduit (static) ######################
 
-set(conduit_todo_SRCS
-	${conduit_SHARED}
-	todo-factory.cc
-	todo-setup.cc
-	todo-conduit.cc
+tde_add_library( vcalconduit STATIC_PIC AUTOMOC
+  SOURCES vcalconduitSettings.kcfgc korganizerConduit.ui
+    kcalRecord.cc vcal-setupbase.cc vcal-conduitbase.cc
+    cleanupstate.cc deleteunsyncedhhstate.cc
+    deleteunsyncedpcstate.cc hhtopcstate.cc
+    initstate.cc pctohhstate.cc teststate.cc
 )
 
-trinity_automoc(${conduit_todo_SRCS})
-add_library(conduit_todo SHARED ${conduit_todo_SRCS})
-target_link_libraries(conduit_todo kcal)
 
-set_target_properties(
-	conduit_vcal PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
-)
-set_target_properties(
-	conduit_todo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
-	INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-	PREFIX ""
+##### conduit_vcal (kpart) ######################
+
+tde_add_kpart( conduit_vcal AUTOMOC
+  SOURCES vcal-conduit.cc vcalRecord.cc vcal-factory.cc vcal-setup.cc
+  LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_vcal)
 
-install(
-	TARGETS conduit_vcal conduit_todo
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
-	LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
+##### conduit_todo (kpart) ######################
+
+tde_add_kpart( conduit_todo AUTOMOC
+  SOURCES todo-conduit.cc todoRecord.cc todo-factory.cc todo-setup.cc
+  LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static
+  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
-trinity_install_libtool_file(conduit_todo)
 
-install(
-	FILES vcal-conduit.desktop todo-conduit.desktop
-	DESTINATION ${KDE3_SERVICES_DIR}
+##### other data ################################
+
+install( FILES vcal-conduit.desktop todo-conduit.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
 )
 
-install(
-	FILES vcalconduitbase.kcfg DESTINATION ${KDE3_KCFG_DIR}
+install( FILES vcalconduitbase.kcfg
+  DESTINATION ${KCFG_INSTALL_DIR}
 )