* enhanced documentation

* [GAM-39] fixed bug in build system

diff --git a/AudioManagerDaemon/docx/03_architecture_overview.dox b/AudioManagerDaemon/docx/03_architecture_overview.dox
index c2a4091..ec399f2 100644 (file)
--- a/AudioManagerDaemon/docx/03_architecture_overview.dox
+++ b/AudioManagerDaemon/docx/03_architecture_overview.dox
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2012, BMW AG
  *
  * This file is part of GENIVI Project AudioManager.
@@ -76,4 +76,4 @@ For every gateway, a controlDomain is defined, this is the domain that registere
 the "other end" of the gateway might be unknown. To handle this situation, a domain can "peek" Domains, Sources and Sinks. When
 something is peeked, it means that an ID is reserved for a unique name without registering it.\n
 If a gateway is deregistered, the source or sink of the controlling domain is deregistered as well - not the one in the "other" domain.
-*/
\ No newline at end of file
+*/

diff --git a/AudioManagerDaemon/docx/images/Interacton_Overview.png b/AudioManagerDaemon/docx/images/Interacton_Overview.png
new file mode 100644 (file)
index 0000000..023b1c0
Binary files /dev/null and b/AudioManagerDaemon/docx/images/Interacton_Overview.png differ

diff --git a/AudioManagerDaemon/docx/images/daemon_insight.png b/AudioManagerDaemon/docx/images/daemon_insight.png
new file mode 100644 (file)
index 0000000..7f4f160
Binary files /dev/null and b/AudioManagerDaemon/docx/images/daemon_insight.png differ

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f0e036..0edb882 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,12 +22,12 @@ execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SO
                 OUTPUT_VARIABLE DAEMONVERSION 
                 OUTPUT_STRIP_TRAILING_WHITESPACE)           
 
-IF (DAEMON_ERROR)
+IF (NOT DAEMONVERSION)
        SET( DAEMONVERSION "homebrew-${CMAKE_SOURCE_DIR}" )
-ELSE (DAEMON_ERROR)
+ELSE (NOT DAEMONVERSION)
     STRING(REGEX REPLACE "(-)[^-]+$" "" DAEMONVERSION ${DAEMONVERSION})
     STRING(REGEX REPLACE "-" "." DAEMONVERSION ${DAEMONVERSION})
-ENDIF(DAEMON_ERROR)
+ENDIF(NOT DAEMONVERSION)
 
 message(STATUS "Build Version ${DAEMONVERSION}")