2 files changed, 41 insertions, 65 deletions
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 )