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