From 2586cb77cfacb6ca157a04a2a5972fc8296455f4 Mon Sep 17 00:00:00 2001
From: Christian Muck <christian.muck@bmw.de>
Date: Mon, 5 Mar 2012 09:29:41 +0100
Subject: Update of dlt-daemon.1, Readme.txt, Install.txt, CMAKELists and
 gitignore

---
 doc/CMakeLists.txt                 | 13 +++++++------
 doc/dlt-daemon.1                   |  9 +++------
 doc/filetransfer_doxygen.cfg.cmake |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 989f521..851e356 100755
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -38,18 +38,19 @@
 if(WITH_DOC)
     find_package(Doxygen)
        
-    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doc/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg @ONLY)
-    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg @ONLY)
+    configure_file(${CMAKE_SOURCE_DIR}/doc/doxygen.cfg.cmake ${CMAKE_BINARY_DIR}/doc/doxygen.cfg @ONLY)
+    configure_file(${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg.cmake ${CMAKE_BINARY_DIR}/doc/filetransfer_doxygen.cfg @ONLY)
 	
 	add_custom_target (doc ALL 
-  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg 
-  		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc
+  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/doxygen.cfg 
+  		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
 	)
 	
 	add_custom_target (doc-filetransfer ALL 
-  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg 
-  		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc
+  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/filetransfer_doxygen.cfg 
+  		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
 	)
+
 endif(WITH_DOC)
 
 if(WITH_MAN)
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1
index 7d3d375..5776745 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -3,7 +3,7 @@
 dlt-daemon \- DLT daemon for logging and tracing purpose
 .SH SYNOPSIS
 .B dlt-daemon
-[\-h] [\-d] [\-v] [\-c filename]
+[\-h] [\-d] [\-c filename]
 .SH DESCRIPTION
 The DLT daemon is the central place where logs and traces are gathered
 from different applications, stored temporarily or permanently and
@@ -20,9 +20,6 @@ Display a short help text.
 \-d
 Daemonize, needed in System V init systems.
 .TP
-\-v
-Display debug information from the running DLT daemon.
-.TP
 \-c
 Load an alternative configuration file. By default the configuration
 file /etc/dlt.conf is loaded.
@@ -33,9 +30,9 @@ Start DLT daemon in background mode:
 \-d
 .PP
 .TP
-Start DLT daemon for debugging purpose with own configuration:
+Start DLT daemon with own configuration:
 .B dlt-daemon
-\-c ~/my-dlt-configuration.cfg \-v
+\-c ~/my-dlt-configuration.cfg
 .PP
 .SH EXIT STATUS
 Non zero is returned in case of failure.
diff --git a/doc/filetransfer_doxygen.cfg.cmake b/doc/filetransfer_doxygen.cfg.cmake
index c3a091a..aa2a3b3 100755
--- a/doc/filetransfer_doxygen.cfg.cmake
+++ b/doc/filetransfer_doxygen.cfg.cmake
@@ -573,7 +573,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = ./filetransfer_mainpage.h \
+INPUT = ./../../doc/filetransfer_mainpage.h \
 	./../src/lib/dlt_filetransfer.c \
 	./../include/dlt_filetransfer.h \
 	./../src/examples/dlt-example-filetransfer.c \
-- 
cgit v1.2.1