* make Telnetserver work with maphandler

* small changes to get cmake script cleaner
* clean up includes of main.cpp
* make DatabaseMaphandler structs private

Signed-off-by: Christian Linke <christian.linke@bmw.de>

1 files changed, 17 insertions, 13 deletions

diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 0eb9100..11019fe 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -50,18 +50,29 @@ SET(AUDIOMAN_SRCS_CXX
     src/CAmCommandSender.cpp
     src/CAmControlReceiver.cpp
     src/CAmControlSender.cpp
-    src/CAmDatabaseHandler.cpp
-    src/CAmMapHandler.cpp
     src/CAmDatabaseObserver.cpp
     src/CAmRoutingReceiver.cpp
     src/CAmRoutingSender.cpp
-    src/CAmSocketHandler.cpp
-    src/CAmTelnetServer.cpp
     src/CAmRouter.cpp
+    src/CAmSocketHandler.cpp
     src/CAmDltWrapper.cpp
-    src/CAmTelnetMenuHelper.cpp
-    src/CAmWatchdog.cpp
 )
+ 
+
+IF(WITH_TELNET)
+	SET (AUDIOMAN_SRCS_CXX
+		${AUDIOMAN_SRCS_CXX}
+		src/CAmTelnetServer.cpp
+		src/CAmTelnetMenuHelper.cpp
+     )		
+ENDIF(WITH_TELNET)		
+
+IF(WITH_SYSTEMD_WATCHDOG)
+	SET (AUDIOMAN_SRCS_CXX
+		${AUDIOMAN_SRCS_CXX}
+		src/CAmWatchdog.cpp
+     )		
+ENDIF(WITH_SYSTEMD_WATCHDOG)
 
 IF (NOT SYSTEMD_FOUND)
 	SET (AUDIOMAN_SRCS_CXX
@@ -84,13 +95,6 @@ IF(WITH_NSM)
     )
 ENDIF(WITH_NSM)
 
-IF(WITH_SOCKETHANDLER_LOOP)
-    SET (AUDIOMAN_SRCS_CXX
-        ${AUDIOMAN_SRCS_CXX}
-        src/CAmSocketHandler.cpp
-     )
-ENDIF(WITH_SOCKETHANDLER_LOOP)
-
 IF(WITH_DATABASE_STORAGE)
     SET (AUDIOMAN_SRCS_CXX
         ${AUDIOMAN_SRCS_CXX}