[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdepim-3.5.5+/kpilot/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2006-12-24 23:49:47
Message-ID: 1167004187.075232.30848.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 616291 by adridg:

Clean up some more cruft from the conversion to CMake; don't duplicate the stubs and \
skels all over the place.

 M  +59 -42    branches/work/kdepim-3.5.5+/kpilot/kpilot/CMakeLists.txt  


--- branches/work/kdepim-3.5.5+/kpilot/kpilot/CMakeLists.txt #616290:616291
@@ -1,25 +1,28 @@
 link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
 
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(
+	${CMAKE_BINARY_DIR}/lib
+	${CMAKE_SOURCE_DIR}/lib
+	${CMAKE_CURRENT_BINARY_DIR}
+)
+
+
+###
+#
+# Settings (KConfigXT) shared between various parts of KPilot
+#
 set(settings_SRC
 	kpilotConfig.cc
 )
 
 kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
 
-set(shared_SRCS
-	${settings_SRC}
-	syncStack.cc
-	hotSync.cc
-	interactiveSync.cc
-)
-
-set(shared_STUBS
-	loggerDCOP.h
-)
-
-kde3_add_dcop_skels(shared_SRCS ${shared_STUBS})
-kde3_add_dcop_stubs(shared_SRCS ${shared_STUBS})
-
+###
+#
+# The KCM for KPilot, used by the config dialog and the embedding in Kontact
+#
 set(kcmpilot_SRCS
 	${settings_SRC}
 	kpilotConfigWizard.cc
@@ -46,65 +49,78 @@
 	dbSelection_base.ui
 )
 
-set(kcmpilot_STUBS
-	pilotDaemonDCOP.h
-)
-
-# Don't forget to include output directory, otherwise
-# the UI file won't be wrapped!
-include_directories(
-	${CMAKE_BINARY_DIR}/lib
-	${CMAKE_SOURCE_DIR}/lib
-	${CMAKE_CURRENT_BINARY_DIR}
-)
-
 kde3_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
 kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
-kde3_add_dcop_skels(kcmpilot_SRCS ${kcmpilot_STUBS})
-kde3_add_dcop_stubs(kcmpilot_SRCS ${kcmpilot_STUBS})
+kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
 kde3_automoc(${kcmpilot_SRCS})
 
 # Now add these generated files to the ADD_LIBRARY step
 # If this is NOT done, then the ui_*.h files will not be generated
 add_library(kcm_kpilot SHARED ${kcmpilot_SRCS})
-set_target_properties(kcm_kpilot PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
+set_target_properties(kcm_kpilot PROPERTIES 
+	LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
 	PREFIX ""
 )
 
+###
+#
+# The daemon-link applications produced here share code
+# for handling a bunch of sync things at once. (This might
+# be moved into libkpilot at some point).
+#
+#
+set(sync_SRCS
+	syncStack.cc
+	hotSync.cc
+	interactiveSync.cc
+)
+
+###
+#
+# Most simple daemon-like application: kpilotTest, which
+# runs whatever the command-line tells it to.
+#
 set(kpilotTest_SRCS
-	${shared_SRCS}
+	${settings_SRC}
+	${sync_SRCS}
 	logWidget.cc
 	pilotComponent.cc
 	main-test.cc
 )
+# Acts as a receiver for DCOP log messages
+kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
 
 kde3_automoc(${kpilotTest_SRCS})
 add_executable(kpilotTest ${kpilotTest_SRCS})
 target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot kdeui kio)
 kpilot_rpath(kpilotTest)
 
+###
+#
+# The real KPilot daemon.
+#
 set(kpilotDaemon_SRCS
-	${shared_SRCS}
+	${settings_SRC}
+	${sync_SRCS}
 	fileInstaller.cc
 	internalEditorAction.cc
 	logFile.cc
 	pilotDaemon.cc
 )
-
-set(kpilot_STUBS
-	kpilotDCOP.h
-	pilotDaemonDCOP.h
-)
-
-kde3_add_dcop_skels(kpilotDaemon_SRCS ${kpilot_STUBS})
-kde3_add_dcop_stubs(kpilotDaemon_SRCS ${kpilot_STUBS})
+# Both sends and receives DCOP log messages. Talks to KPilot.
+kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
+kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
 kde3_automoc(${kpilotDaemon_SRCS})
 add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
 target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot kdeui kio)
 kpilot_rpath(kpilotDaemon)
 
+###
+#
+# The KPilot executable (viewer / editor / configuration).
+#
 set(kpilot_SRCS
-	${shared_SRCS}
+	${settings_SRC}
 	logWidget.cc
 	kpilot.cc
 	dbviewerWidget.cc
@@ -129,8 +145,9 @@
 )
 
 kde3_add_ui_files(kpilot_SRCS ${kpilot_UIS})
-kde3_add_dcop_skels(kpilot_SRCS ${kpilot_STUBS})
-kde3_add_dcop_stubs(kpilot_SRCS ${kpilot_STUBS})
+# Talks to the daemon. Listens as itself.
+kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
+kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
 kde3_automoc(${kpilot_SRCS})
 add_executable(kpilot_bin ${kpilot_SRCS})
 target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot kutils kdeui kio)


[prev in list] [next in list] [prev in thread] [next in thread]