1 files changed, 24 insertions, 31 deletions
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}
+)