1 files changed, 36 insertions, 54 deletions
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}
 )