Update project structure

25 files changed, 366 insertions, 385 deletions

diff --git a/.gitignore b/.gitignore
index cb894cb..4e5b679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
 Release/
+Debug/
 build/
 automotive-dlt.spec
 automotive-dlt.pc
 config.h
-configure
 include/dlt/dlt_version.h
+doc/DOC_DLT/
+doc/DOC_DLT_Filetransfer/
+doc/doxygen.cfg
+doc/filetransfer_doxygen.cfg
+
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0c4ea9..022b5c0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,205 +35,98 @@
  # @licence end@

 ########

 

-CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )

-MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)

+cmake_minimum_required( VERSION 2.6 )

+project( automotive-dlt )

 

-SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )

+mark_as_advanced( CMAKE_BACKWARDS_COMPATIBILITY)

+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )

 

-PROJECT( automotive-dlt )

+# Set version parameters

+set( DLT_MAJOR_VERSION 2)

+set( DLT_MINOR_VERSION 5)

+set( DLT_PATCH_LEVEL 0)

+set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})

+set( DLT_VERSION_STATE BETA )

+set( DLT_REVISION "")

 

-############## Set version parameters ####################### 

-SET( ${PROJECT_NAME}_MAJOR_VERSION 2 )

-SET( ${PROJECT_NAME}_MINOR_VERSION 5 )

-SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )

-SET( ${PROJECT_NAME}_VERSION_STATE BETA )

-SET( GENIVI_PROJECT_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})

-

-SET( PRINT_MAJOR_VERSION ${${PROJECT_NAME}_MAJOR_VERSION})

-SET( PRINT_MINOR_VERSION ${${PROJECT_NAME}_MINOR_VERSION})

-SET( PRINT_PATCH_LEVEL ${${PROJECT_NAME}_PATCH_LEVEL})

-SET( PRINT_VERSION ${GENIVI_PROJECT_VERSION})

-SET( PRINT_VERSION_STATE ${${PROJECT_NAME}_VERSION_STATE})

-SET( DLT_REVISION "")

-

-EXECUTE_PROCESS(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

+execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

 	OUTPUT_VARIABLE DLT_REVISION

 	ERROR_VARIABLE GIT_ERROR 

 	OUTPUT_STRIP_TRAILING_WHITESPACE

 	ERROR_STRIP_TRAILING_WHITESPACE)

-IF( DLT_REVISION MATCHES "^$")

-	SET( PRINT_REVISION "Git revision unavailable")

-ELSE( DLT_REVISION MATCHES "")

-	STRING(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION})

-	SET( PRINT_REVISION ${DLT_REVISION})	

-ENDIF( DLT_REVISION MATCHES "^$")

-

-##################### RPM SPEC CONFIG ########################

-SET( GENIVI_RPM_RELEASE "1${DLT_REVISION}")

-SET( LICENSE "LGPL v2.1 with special exception" )

-

-#########################################################

-SET(GENIVI_BUILDSYSTEM_AVAILABLE $ENV{GENIVI_BUILDSYSTEM})

-IF(GENIVI_BUILDSYSTEM_AVAILABLE)

-	INCLUDE($ENV{GENIVI_BUILDSYSTEM}/cmake_extensions/GeniviCMakeExtensions.cmake)

-ENDIF(GENIVI_BUILDSYSTEM_AVAILABLE)

-

-

-###################### GPROF Settings ###################

-# Adds compile flag for gprof to target

-# Run the binary

-# Output: gmon.out in build directory

-# Run: gprof <path/to/binary> > profile.output

-SET( GPROF_DLT_DAEMON OFF )

-SET( GPROF_DLT_LIB OFF )

-SET( GPROF_DLT_EXAMPLES OFF) 

-SET( GPROF_DLT_TESTS OFF) 

-SET( GPROF_DLT_CONSOLE OFF)

-SET( GPROF_DLT_ADAPTOR OFF)

-

-###################### systemd Settings #################

-SET( DLT_SYSLOG_APPID "SYS" )

-SET( DLT_SYSLOG_CTID "LOG" )

-SET( DLT_SYSLOG_PORT 4712 )

-

-SET( prefix ${CMAKE_INSTALL_PREFIX})

-SET( libdir "\${exec_prefix}/lib" )

-SET( includedir "\${exec_prefix}/include" )

-

-SET( DLTBINDIR ${CMAKE_INSTALL_PREFIX}/bin )

-SET( DLTLIBDIR ${CMAKE_INSTALL_PREFIX}/lib )

-SET( DLTLIBSTATIC ${CMAKE_INSTALL_PREFIX}/lib )

-SET( DLTINCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include )

-SET( DLTDOCDIR ${CMAKE_INSTALL_PREFIX}/doc ) 

-

-IF(NOT CMAKE_BUILD_TYPE)

-	SET(CMAKE_BUILD_TYPE RelWithDebInfo)

-ENDIF(NOT CMAKE_BUILD_TYPE)

-

-FIND_PACKAGE(Doxygen)

-FIND_PACKAGE(Threads REQUIRED)

-

-INCLUDE_DIRECTORIES( 

-${CMAKE_SOURCE_DIR}/

-${CMAKE_SOURCE_DIR}/include/dlt

-${CMAKE_SOURCE_DIR}/src/shared/ 

-${CMAKE_SOURCE_DIR}/src/lib/

-${CMAKE_SOURCE_DIR}/src/daemon/ )

-

-ADD_DEFINITIONS( "-Wall" )

-

-###################### IPC settings #################

-# Disable following definition, if old Fifo version

-# should be used

-# ADD_DEFINITIONS( -DDLT_SHM_ENABLE=1 )

-

-INCLUDE(TestBigEndian)

-

-TEST_BIG_ENDIAN( DLT_BIGENDIAN )

-

-IF ( DLT_BIGENDIAN )

-	ADD_DEFINITIONS( -DBYTE_ORDER=BIG_ENDIAN )

-ELSE ( DLT_BIGENDIAN )

-	ADD_DEFINITIONS( -DBYTE_ORDER=LITTLE_ENDIAN )

-ENDIF ( DLT_BIGENDIAN )

-

-INCLUDE(CheckIncludeFiles)  

-

-CHECK_INCLUDE_FILES( arpa/inet.h HAVE_ARPAINET_H)

-CHECK_INCLUDE_FILES( fcntl.h HAVE_FCNTL_H)

-CHECK_INCLUDE_FILES( float.h HAVE_FLOAT_H)

-CHECK_INCLUDE_FILES( limits.h HAVE_LIMITS_H)

-CHECK_INCLUDE_FILES( netdb.h HAVE_NETDB_H)

-CHECK_INCLUDE_FILES( netinet/in.h HAVE_NETINETIN_H)

-CHECK_INCLUDE_FILES( stddef.h HAVE_STDDEF_H)

-CHECK_INCLUDE_FILES( stdint.h HAVE_STDINT_H)

-CHECK_INCLUDE_FILES( stdlib.h HAVE_STDLIB_H)

-CHECK_INCLUDE_FILES( string.h HAVE_STRING_H)

-CHECK_INCLUDE_FILES( strings.h HAVE_STRINGS_H)

-CHECK_INCLUDE_FILES( sys/ioctl.h HAVE_SYSIOCTL_H)

-CHECK_INCLUDE_FILES( sys/socket.h HAVE_SYSSOCKET_H)

-CHECK_INCLUDE_FILES( sys/time.h HAVE_SYSTIME_H)

-CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H)

-CHECK_INCLUDE_FILES( sys/ipc.h HAVE_SYSIPC_H)

-CHECK_INCLUDE_FILES( netdb.h HAVE_NETDB_H)

-CHECK_INCLUDE_FILES( ctype.h HAVE_CTYPE_H)

-CHECK_INCLUDE_FILES( signal.h HAVE_SIGNAL_H)

-CHECK_INCLUDE_FILES( syslog.h HAVE_SYSLOG_H)

-CHECK_INCLUDE_FILES( sys/stat.h HAVE_SYSSTAT_H)

-CHECK_INCLUDE_FILES( linux/stat.h HAVE_LINUXSTAT_H)

-CHECK_INCLUDE_FILES( sys/uio.h HAVE_SYSUIO_H)

-CHECK_INCLUDE_FILES( termios.h HAVE_TERMIOS_H)

-CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H)

-

-INCLUDE(CheckFunctionExists) 

-

-CHECK_FUNCTION_EXISTS( bzero HAVE_FUNC_BZERO)

-CHECK_FUNCTION_EXISTS( clock_gettime HAVE_FUNC_CLOCKGETTIME)

-CHECK_FUNCTION_EXISTS( floor HAVE_FUNC_FLOOR)

-CHECK_FUNCTION_EXISTS( fork HAVE_FUNC_FORK)

-CHECK_FUNCTION_EXISTS( gethostbyname HAVE_FUNC_GETHOSTBYNAME)

-CHECK_FUNCTION_EXISTS( gettimeofday HAVE_FUNC_GETTIMEBYDAY)

-CHECK_FUNCTION_EXISTS( inet_ntoa HAVE_FUNC_INETNTOA)

-CHECK_FUNCTION_EXISTS( malloc HAVE_FUNC_MALLOC)

-CHECK_FUNCTION_EXISTS( memmove HAVE_FUNC_MEMMOVE)

-CHECK_FUNCTION_EXISTS( memset HAVE_FUNC_MEMSET)

-CHECK_FUNCTION_EXISTS( mkfifo HAVE_FUNC_MKFIFO)

-CHECK_FUNCTION_EXISTS( select HAVE_FUNC_SELECT)

-CHECK_FUNCTION_EXISTS( socket HAVE_FUNC_SOCKET)

-CHECK_FUNCTION_EXISTS( strchr HAVE_FUNC_STRCHR)

-CHECK_FUNCTION_EXISTS( strerror HAVE_FUNC_STRERROR)

-CHECK_FUNCTION_EXISTS( strstr HAVE_FUNC_STRSTR)

-CHECK_FUNCTION_EXISTS( strtol HAVE_FUNC_STRTOL)

-

-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h @ONLY)

-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h.cmake ${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h @ONLY)

-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.pc.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.pc @ONLY)

-#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt.service @ONLY)

-#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service @ONLY)

-#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon.cmake ${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon @ONLY)

-#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/testscripts/Ubuntu/dlt-daemon.cmake ${CMAKE_SOURCE_DIR}/testscripts/Ubuntu/dlt-daemon @ONLY)

-

-

-OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )

-OPTION(ENABLE_BUILD_DOC "Set to ON to build Documentation" OFF)

-

-MESSAGE( STATUS )

-MESSAGE( STATUS "-------------------------------------------------------------------------------" )

-MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${PRINT_REVISION}")

-MESSAGE( STATUS "VERSION_STATE ${PRINT_VERSION_STATE}")

-MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

-MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )

-MESSAGE( STATUS "ENABLE_BUILD_DOC = ${ENABLE_BUILD_DOC}" )

-MESSAGE( STATUS "Change a value with: cmake -D<Variable>=<Value>" )

-MESSAGE( STATUS "-------------------------------------------------------------------------------" )

-MESSAGE( STATUS )

-

-SET( BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL "Set to OFF to build static libraries" FORCE )

-SET( CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Where to install ${PROJECT_NAME}" FORCE )

-SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING

-"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )

-#SET( ENABLE_BUILD_DOC "${ENABLE_BUILD_DOC}" CACHE BOOL "Set to ON to build Documentation" FORCE )

-

-ADD_SUBDIRECTORY( src )

-ADD_SUBDIRECTORY( include )

-ADD_SUBDIRECTORY( testscripts )

-

-IF (ENABLE_BUILD_DOC)

-	ADD_SUBDIRECTORY( doc )

-ENDIF(ENABLE_BUILD_DOC)

-

-INSTALL(FILES automotive-dlt.pc

-        DESTINATION lib/pkgconfig 

-	COMPONENT devel)

-

-CONFIGURE_FILE(

-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

-

-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

-  IMMEDIATE @ONLY)

-

-#ADD_CUSTOM_TARGET(uninstall

-#  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

-

-EXPORT_LIBRARY_DEPENDENCIES( "${PROJECT_NAME}LibDeps.cmake" )

+if( DLT_REVISION MATCHES "^$")

+	set( PRINT_REVISION "Git revision unavailable")

+else( DLT_REVISION MATCHES "")

+	string(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION})

+	set( PRINT_REVISION ${DLT_REVISION})	

+endif( DLT_REVISION MATCHES "^$")

+

+# set default build type, if not defined by user

+if(NOT CMAKE_BUILD_TYPE)

+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

+                         "Choose build type: Debug, Release, RelWithDebInfo, MinSizeRel."

+                         FORCE)

+    message(STATUS "Build type not defined. Using default build type 'RelWithDebInfo'.")

+endif(NOT CMAKE_BUILD_TYPE)

+

+# Set of indiviual options

+option(BUILD_SHARED_LIBS      "Set to OFF to build static libraries"                 ON  )

+option(WITH_DLT_SHM_ENABLE    "Set to OFF to use FIFO as IPC from user to daemon"    OFF )

+option(WITH_DOC               "Set to ON to build documentation target"              OFF )

+option(WITH_CHECK_CONFIG_FILE "Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists " OFF )

+option(WITH_TESTSCRIPTS       "Set to on to run CMakeLists.txt in testscripts"       OFF )

+option(WITH_SYSTEMD           "Set to on to run CMakeLists.txt in systemd"           OFF )

+option(WITH_GPROF             "Set -pg to compile flags"                             OFF )

+

+# RPM settings

+set( GENIVI_RPM_RELEASE "1${DLT_REVISION}")

+set( LICENSE "LGPL v2.1 with special exception" )

+

+# Build, project and include settings

+find_package(Threads REQUIRED)

+

+include_directories( 

+    ${CMAKE_SOURCE_DIR}/

+    ${CMAKE_SOURCE_DIR}/include/dlt

+    ${CMAKE_SOURCE_DIR}/src/shared/ 

+    ${CMAKE_SOURCE_DIR}/src/lib/

+    ${CMAKE_SOURCE_DIR}/src/daemon/

+)

+

+if(WITH_DLT_SHM_ENABLE)

+    add_definitions( -DDLT_SHM_ENABLE)

+endif(WITH_DLT_SHM_ENABLE)

+   

+if(WITH_GPROF)
+  SET(CMAKE_C_FLAGS "-pg")
+endif(WITH_GPROF)   

+   

+add_definitions( "-Wall" )

+

+add_subdirectory( cmake )

+

+message( STATUS )

+message( STATUS "-------------------------------------------------------------------------------" )

+message( STATUS "Build for Version ${DLT_VERSION} build ${DLT_REVISION} version state ${DLT_VERSION_STATE}")

+message( STATUS "WITH_DLT_SHM_ENABLE = ${WITH_DLT_SHM_ENABLE}" )

+message( STATUS "WITH_CHECK_CONFIG_FILE = ${WITH_CHECK_CONFIG_FILE}" )

+message( STATUS "WITH_DOC = ${WITH_DOC}" )

+message( STATUS "WITH_TESTSCRIPTS = ${WITH_TESTSCRIPTS}" )

+message( STATUS "WITH_SYSTEMD = ${WITH_SYSTEMD}" )

+message( STATUS "WITH_GPROF = ${WITH_GPROF}" )

+message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

+message( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )

+message( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )

+message( STATUS "Change a value with: cmake -D<Variable>=<Value>" )

+message( STATUS "-------------------------------------------------------------------------------" )

+message( STATUS )

+

+configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)

+configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)

+install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig COMPONENT devel)

+

+add_subdirectory( doc )

+add_subdirectory( src )

+add_subdirectory( include )

+add_subdirectory( testscripts )

+add_subdirectory( systemd )
\ No newline at end of file
diff --git a/README b/README
deleted file mode 100644
index 9801839..0000000
--- a/README
+++ /dev/null
@@ -1,13 +0,0 @@
-License
--------
-See file: LICENSE.txt
-The full LGPL license: LGPL.txt
-
-Compiling in Linux:
--------------------
-- create directory build
-- change into directory build
-- cmake ..
-- make
-- optional: sudo make install
-- optional: sudo ldconfig
diff --git a/README.txt b/README.txt
index 9801839..95f12e8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,13 +1,75 @@
+DLT  - Automotive Diagnostic Log and Trace
+
+Version: 2.5.0_BETA
+
+This component provides a standardised log and trace interface, based on the
+standardised protocol specified in the AUTOSAR standard 4.0 DLT.
+This component can be used by GENIVI components and other applications as
+logging facility providing
+- the DLT shared library
+- the DLT daemon
+- the DLT daemon adaptors
+- the DLT client console utilities
+- the DLT test applications
+
+The DLT daemon is the central component in GENIVI, which gathers all 
+logs and traces from the DLT user applications. The logs and traces 
+are stored optionally directly in a file in the ECU. The DLT daemon 
+forwards all logs and traces to a connected DLT client.
+The DLT client can send control messages to the daemon, e.g. to set 
+individual log levels of applications and contexts or get the list of 
+applications and contexts registered in the DLT daemon.
+
+
+Homepage
+--------
+https://collab.genivi.org/wiki/display/geniviproj/Automotive+DLT+%28Diagnostic+Log+and+Trace%29
+
+
 License
 -------
-See file: LICENSE.txt
-The full LGPL license: LGPL.txt
+Full information on the license for this software
+is available in the "LICENSE.txt" file. 
+The full LGPL license is in "LGPL.txt."
+
+
+Contact
+-------
+Alexander Wenzel (Alexander.AW.Wenzel@bmw.de)
+Christian Muck (christian.muck@bmw.de)
+
 
 Compiling in Linux:
 -------------------
-- create directory build
-- change into directory build
+- mkdir build
+- cd build
 - cmake ..
 - make
 - optional: sudo make install
 - optional: sudo ldconfig
+
+
+Compile options with default values
+-----------------------------------
+-- WITH_DLT_SHM_ENABLE =       OFF
+-- WITH_CHECK_CONFIG_FILE =    OFF
+-- WITH_DOC =                  OFF
+-- WITH_TESTSCRIPTS =          OFF
+-- WITH_SYSTEMD =              OFF
+-- WITH_GPROF = 			   OFF
+-- BUILD_SHARED_LIBS =         ON
+-- CMAKE_INSTALL_PREFIX =      /usr/local
+-- CMAKE_BUILD_TYPE =          RelWithDebInfo
+
+In order to change these options, you can modify this values with ccmake, do the appropriate changes in CmakeList.txt or via 
+the commandline for cmake
+-- Change a value with: cmake -D<Variable>=<Value>
+
+
+Create documentation
+--------------------
+- mkdir build
+- cd build
+- cmake -DWITH_DOC=ON ..
+- make doc
+- (optional)make doc-filetransfer
\ No newline at end of file
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index ea5793e..760bc0f 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,24 +1,37 @@
-DLT - Automotive Diagnostic Log and Trace

+DLT  - Automotive Diagnostic Log and Trace

 

 Version: 2.5.0_BETA

 

-

-Introduction

-------------

-

-The DLT daemon is the central component in GENIVI, which gathers all logs and traces from the DLT user applications. The logs and traces are stored optionally directly in a file in the ECU. The DLT daemon forwards all logs and traces to a connected DLT client.

-The DLT client can send control messages to the daemon, e.g. to set individual log levels of applications and contexts or get the list of applications and contexts registered in the DLT daemon.

+This component provides a standardised log and trace interface, based on the

+standardised protocol specified in the AUTOSAR standard 4.0 DLT.

+This component can be used by GENIVI components and other applications as

+logging facility providing

+- the DLT shared library

+- the DLT daemon

+- the DLT daemon adaptors

+- the DLT client console utilities

+- the DLT test applications

+

+The DLT daemon is the central component in GENIVI, which gathers all 

+logs and traces from the DLT user applications. The logs and traces 

+are stored optionally directly in a file in the ECU. The DLT daemon 

+forwards all logs and traces to a connected DLT client.

+The DLT client can send control messages to the daemon, e.g. to set 

+individual log levels of applications and contexts or get the list of 

+applications and contexts registered in the DLT daemon.

 

 

 License

 -------

-see file: License.txt

+Full information on the license for this software

+is available in the "LICENSE.txt" file. 

+The full LGPL license is in "LGPL.txt."

+

 

 Contact

 -------

-Alexander Wenzel

-BMW Group

-Alexander.AW.Wenzel@bmw.de

+Alexander Wenzel (Alexander.AW.Wenzel@bmw.de)

+Christian Muck (christian.muck@bmw.de)

 

 

 Changes in this release

diff --git a/automotive-dlt.pc.cmake b/automotive-dlt.pc.cmake
deleted file mode 100755
index 0284c5c..0000000
--- a/automotive-dlt.pc.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: DLT
-Description: Diagnostic Log and Trace 
-Version: @GENIVI_PROJECT_VERSION@
-Requires: 
-Libs: -L${libdir} -ldlt -lrt -lpthread
-Cflags: -I${includedir}/dlt -DDLT_@PRINT_MAJOR_VERSION@_@PRINT_MINOR_VERSION@
-
diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in
new file mode 100755
index 0000000..b0a766f
--- /dev/null
+++ b/automotive-dlt.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: DLT
+Description: Diagnostic Log and Trace 
+Version: @DLT_VERSION@
+Requires: 
+Libs: -L${libdir} -ldlt -lrt -lpthread
+Cflags: -I${includedir}/dlt -DDLT_@DLT_MAJOR_VERSION@_@DLT_MINOR_VERSION@
+
diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in
index 3a0ec8f..8c8b480 100644
--- a/automotive-dlt.spec.in
+++ b/automotive-dlt.spec.in
@@ -1,11 +1,11 @@
 Name: @PROJECT_NAME@
-Summary: %{name} - Diagnostic Log and Trace
-Version: @GENIVI_PROJECT_VERSION@
+Version: @DLT_VERSION@
 Release: @GENIVI_RPM_RELEASE@
-License: @LICENSE@
+Summary: %{name} - Diagnostic Log and Trace
 Group: System Environment/Base
 Vendor: BMW Group AG
-Source: %{name}-%{version}.tar.gz
+License: @LICENSE@
+Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: %{name} = %{version}-%{release}, pkgconfig
 
@@ -20,6 +20,7 @@ logging facility providing
 - the DLT client console utilities
 - the DLT test applications
 
+
 %package doc
 Summary:        %{name} - Diagnostic Log and Trace: Documentation
 Group:          Documentation
@@ -27,6 +28,8 @@ Group:          Documentation
 %description doc
 This component provides the documentation for %{name}.
 
+
+
 %package devel
 Summary:        %{name} - Diagnostic Log and Trace: Development files
 Group:          Development/Libraries
@@ -37,18 +40,19 @@ This component provides the development libraries and includes for %{name}.
 
 
 %prep
-%setup
-echo "building package automotive-dlt"
+%setup -q
+
 
 
 %build
 rm -rf build
 mkdir -p build
 cd build
-../configure --host=@HOST_TYPE@ --prefix=%{_usr}
+#../configure --host=@HOST_TYPE@ --prefix=%{_prefix}
+#make
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 cd build
@@ -56,6 +60,18 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 make install DESTDIR=$RPM_BUILD_ROOT
 #/usr/bin/install -c -m 755 testscripts/Meego/dlt-daemon $RPM_BUILD_ROOT/etc/init.d
 
+
+%pre
+
+
+%post
+/sbin/ldconfig
+
+
+%postun
+/sbin/ldconfig
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,8 +82,8 @@ rm -rf $RPM_BUILD_ROOT
 /etc/dlt.conf
 /usr/share/dlt-filetransfer/dlt-test-filetransfer-file
 /usr/share/dlt-filetransfer/dlt-test-filetransfer-image.png
-%{_libdir}/libdlt.so.@PRINT_MAJOR_VERSION@
-%{_libdir}/libdlt.so.@GENIVI_PROJECT_VERSION@
+%{_libdir}/libdlt.so.@DLT_MAJOR_VERSION@
+%{_libdir}/libdlt.so.@DLT_VERSION@
 %{_libdir}/libdlt.so
 %{_bindir}/dlt-system
 %{_bindir}/dlt-convert
@@ -89,16 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/dlt-example-user-func
 %{_bindir}/dlt-example-filetransfer
 
-
-
 %files devel
-%{_libdir}/pkgconfig/*.pc
 %{_includedir}/dlt/*.h
-%{_libdir}/pkgconfig/automotive-dlt.pc
-
-%pre
-
-%post
+%{_libdir}/pkgconfig/@PROJECT_NAME@.pc
 
 %changelog
 * Wed Nov 24 2010 dlt_maintainer <dlt_maintainer@genivi.org> 2.2.0
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
new file mode 100644
index 0000000..78f6d65
--- /dev/null
+++ b/cmake/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Run CheckIncludeFiles and CheckFunctionExists
+include(TestBigEndian)
+TEST_BIG_ENDIAN( DLT_BIGENDIAN )
+if( DLT_BIGENDIAN )
+	add_definitions( -DBYTE_ORDER=BIG_ENDIAN )
+else ( DLT_BIGENDIAN )
+	add_definitions( -DBYTE_ORDER=LITTLE_ENDIAN )
+endif ( DLT_BIGENDIAN )
+
+INCLUDE(CheckIncludeFiles)  
+
+CHECK_INCLUDE_FILES( arpa/inet.h HAVE_ARPAINET_H)
+CHECK_INCLUDE_FILES( fcntl.h HAVE_FCNTL_H)
+CHECK_INCLUDE_FILES( float.h HAVE_FLOAT_H)
+CHECK_INCLUDE_FILES( limits.h HAVE_LIMITS_H)
+CHECK_INCLUDE_FILES( netdb.h HAVE_NETDB_H)
+CHECK_INCLUDE_FILES( netinet/in.h HAVE_NETINETIN_H)
+CHECK_INCLUDE_FILES( stddef.h HAVE_STDDEF_H)
+CHECK_INCLUDE_FILES( stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILES( stdlib.h HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES( string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILES( strings.h HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES( sys/ioctl.h HAVE_SYSIOCTL_H)
+CHECK_INCLUDE_FILES( sys/socket.h HAVE_SYSSOCKET_H)
+CHECK_INCLUDE_FILES( sys/time.h HAVE_SYSTIME_H)
+CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES( sys/ipc.h HAVE_SYSIPC_H)
+CHECK_INCLUDE_FILES( netdb.h HAVE_NETDB_H)
+CHECK_INCLUDE_FILES( ctype.h HAVE_CTYPE_H)
+CHECK_INCLUDE_FILES( signal.h HAVE_SIGNAL_H)
+CHECK_INCLUDE_FILES( syslog.h HAVE_SYSLOG_H)
+CHECK_INCLUDE_FILES( sys/stat.h HAVE_SYSSTAT_H)
+CHECK_INCLUDE_FILES( linux/stat.h HAVE_LINUXSTAT_H)
+CHECK_INCLUDE_FILES( sys/uio.h HAVE_SYSUIO_H)
+CHECK_INCLUDE_FILES( termios.h HAVE_TERMIOS_H)
+CHECK_INCLUDE_FILES( unistd.h HAVE_UNISTD_H)
+
+INCLUDE(CheckFunctionExists) 
+
+CHECK_FUNCTION_EXISTS( bzero HAVE_FUNC_BZERO)
+CHECK_FUNCTION_EXISTS( clock_gettime HAVE_FUNC_CLOCKGETTIME)
+CHECK_FUNCTION_EXISTS( floor HAVE_FUNC_FLOOR)
+CHECK_FUNCTION_EXISTS( fork HAVE_FUNC_FORK)
+CHECK_FUNCTION_EXISTS( gethostbyname HAVE_FUNC_GETHOSTBYNAME)
+CHECK_FUNCTION_EXISTS( gettimeofday HAVE_FUNC_GETTIMEBYDAY)
+CHECK_FUNCTION_EXISTS( inet_ntoa HAVE_FUNC_INETNTOA)
+CHECK_FUNCTION_EXISTS( malloc HAVE_FUNC_MALLOC)
+CHECK_FUNCTION_EXISTS( memmove HAVE_FUNC_MEMMOVE)
+CHECK_FUNCTION_EXISTS( memset HAVE_FUNC_MEMSET)
+CHECK_FUNCTION_EXISTS( mkfifo HAVE_FUNC_MKFIFO)
+CHECK_FUNCTION_EXISTS( select HAVE_FUNC_SELECT)
+CHECK_FUNCTION_EXISTS( socket HAVE_FUNC_SOCKET)
+CHECK_FUNCTION_EXISTS( strchr HAVE_FUNC_STRCHR)
+CHECK_FUNCTION_EXISTS( strerror HAVE_FUNC_STRERROR)
+CHECK_FUNCTION_EXISTS( strstr HAVE_FUNC_STRSTR)
+CHECK_FUNCTION_EXISTS( strtol HAVE_FUNC_STRTOL)
+
+if(WITH_CHECK_CONFIG_FILE)
+  configure_file(${CMAKE_SOURCE_DIR}/cmake/config.h.cmake ${PROJECT_BINARY_DIR}/include/dlt/config.h)
+endif(WITH_CHECK_CONFIG_FILE)
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/dlt_version.h.cmake ${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h @ONLY)
diff --git a/config.h.cmake b/cmake/config.h.cmake
index 11f99c6..31f1144 100755
--- a/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -1,3 +1,7 @@
+// DO NOT EDIT! GENERATED AUTOMATICALLY!
+// cmakedefine01 <variable> sets #define <variable> [0|1] if variable is defined in cmake
+// variable is set by CHECK_INCLUDE_FILES and CHECK_FUNCTION_EXISTS
+
 #cmakedefine01 HAVE_ARPAINET_H
 #cmakedefine01 HAVE_FCNTL_H
 #cmakedefine01 HAVE_FLOAT_H
diff --git a/cmake/dlt_version.h.cmake b/cmake/dlt_version.h.cmake
new file mode 100755
index 0000000..949bf9e
--- /dev/null
+++ b/cmake/dlt_version.h.cmake
@@ -0,0 +1,12 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+#ifndef __DLT_VERSION_H_
+#define __DLT_VERSION_H_
+
+#define _DLT_PACKAGE_VERSION_STATE "@DLT_VERSION_STATE@"
+#define _DLT_PACKAGE_VERSION "@DLT_VERSION@"
+#define _DLT_PACKAGE_MAJOR_VERSION "@DLT_MAJOR_VERSION@"
+#define _DLT_PACKAGE_MINOR_VERSION "@DLT_MINOR_VERSION@"
+#define _DLT_PACKAGE_PATCH_LEVEL "@DLT_PATCH_LEVEL@"
+#define _DLT_PACKAGE_REVISION "@DLT_REVISION@"
+
+#endif
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
deleted file mode 100755
index 17376d2..0000000
--- a/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,22 +0,0 @@
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-  IF(EXISTS "$ENV{DESTDIR}${file}")
-    EXEC_PROGRAM(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    IF(NOT "${rm_retval}" STREQUAL 0)
-      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-    ENDIF(NOT "${rm_retval}" STREQUAL 0)
-  ELSE(EXISTS "$ENV{DESTDIR}${file}")
-    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
-ENDFOREACH(file)
-
diff --git a/distfiles b/distfiles
index 687b1e1..5c6285d 100755
--- a/distfiles
+++ b/distfiles
@@ -5,13 +5,8 @@ include/dlt/.*(\.h|\.cpp|\.cmake)
 #testscripts/Ubuntu/.*(\.h|\.cpp|\.cmake)
 #testscripts/Meego/.*(\.h|\.cpp|\.cmake)
 #systemd/.*(\.h|\.cpp|\.cmake)
-configure
-distfiles
 automotive-dlt.spec.in
-cmake_uninstall.cmake.in
 [^/]*\.cmake
-.*\.xpm
-README
 src/daemon/dlt.conf
 src/system/dlt-system.conf
 src/tests/dlt-test-filetransfer-file
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d28c230..aea40b2 100755
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -35,27 +35,19 @@
  # @licence end@
 ########
 
-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)
+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)
 	
-ADD_CUSTOM_COMMAND(
-	OUTPUT ${CMAKE_SOURCE_DIR}/doxygen-execute
-	DEPENDS  ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg
-	COMMAND doxygen
-	ARGS ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg
-)
-
-ADD_CUSTOM_COMMAND(
-	OUTPUT ${CMAKE_SOURCE_DIR}/doxygen-execute2
-	DEPENDS  ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg
-	COMMAND doxygen
-	ARGS ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg
-)
-
-ADD_CUSTOM_TARGET(doc ALL DEPENDS ${CMAKE_SOURCE_DIR}/doxygen-execute)
-ADD_CUSTOM_TARGET(doc-filetransfer ALL DEPENDS ${CMAKE_SOURCE_DIR}/doxygen-execute2)
-
-SET( DOC_COMPONENT doc) 
-
-
-
+	add_custom_target (doc ALL 
+  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg 
+  		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc
+	)
+	
+	add_custom_target (doc-filetransfer ALL 
+  		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg 
+  		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/doc
+	)
+endif(WITH_DOC)
\ No newline at end of file
diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h
deleted file mode 100755
index 49f9e7b..0000000
--- a/include/dlt/dlt_version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#ifndef __DLT_VERSION_H_
-#define __DLT_VERSION_H_
-
-#define _DLT_PACKAGE_VERSION_STATE "BETA"
-#define _DLT_PACKAGE_VERSION "2.5.0"
-#define _DLT_PACKAGE_MAJOR_VERSION "2"
-#define _DLT_PACKAGE_MINOR_VERSION "5"
-#define _DLT_PACKAGE_PATCH_LEVEL "0"
-#define _DLT_PACKAGE_REVISION "v2.5.0_BETA_3_g5f0abf6"
-
-#endif
diff --git a/include/dlt/dlt_version.h.cmake b/include/dlt/dlt_version.h.cmake
deleted file mode 100755
index 3a80a23..0000000
--- a/include/dlt/dlt_version.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#ifndef __DLT_VERSION_H_
-#define __DLT_VERSION_H_
-
-#define _DLT_PACKAGE_VERSION_STATE "@PRINT_VERSION_STATE@"
-#define _DLT_PACKAGE_VERSION "@PRINT_VERSION@"
-#define _DLT_PACKAGE_MAJOR_VERSION "@PRINT_MAJOR_VERSION@"
-#define _DLT_PACKAGE_MINOR_VERSION "@PRINT_MINOR_VERSION@"
-#define _DLT_PACKAGE_PATCH_LEVEL "@PRINT_PATCH_LEVEL@"
-#define _DLT_PACKAGE_REVISION "@PRINT_REVISION@"
-
-#endif
diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt
index a07bcbb..8a04377 100755
--- a/src/adaptor/CMakeLists.txt
+++ b/src/adaptor/CMakeLists.txt
@@ -37,17 +37,11 @@
 
 set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin)
 add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS})
-IF(GPROF_DLT_ADAPTOR)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_ADAPTOR)
 target_link_libraries(dlt-adaptor-stdin dlt)
 set_target_properties(dlt-adaptor-stdin PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_adaptor_udp_SRCS dlt-adaptor-udp)
 add_executable(dlt-adaptor-udp ${dlt_adaptor_udp_SRCS})
-IF(GPROF_DLT_ADAPTOR)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_ADAPTOR)
 target_link_libraries(dlt-adaptor-udp dlt)
 set_target_properties(dlt-adaptor-udp PROPERTIES LINKER_LANGUAGE C)
 
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index 6de6723..6cc03ac 100755
--- a/src/console/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -37,17 +37,11 @@
 
 set(dlt_convert_SRCS dlt-convert)
 add_executable(dlt-convert ${dlt_convert_SRCS} ${dlt_most_SRCS})
-IF(GPROF_DLT_CONSOLE)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_CONSOLE)
 target_link_libraries(dlt-convert dlt ${EXPAT_LIBRARIES})
 set_target_properties(dlt-convert PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_receive_SRCS dlt-receive)
 add_executable(dlt-receive ${dlt_receive_SRCS} ${dlt_most_SRCS})
-IF(GPROF_DLT_CONSOLE)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_CONSOLE)
 target_link_libraries(dlt-receive dlt ${EXPAT_LIBRARIES})
 set_target_properties(dlt-receive PROPERTIES LINKER_LANGUAGE C)
 
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 921f2d3..5ae1a14 100755
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -37,9 +37,6 @@
 
 set(dlt_daemon_SRCS dlt-daemon dlt_daemon_common ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c)
 add_executable(dlt-daemon ${dlt_daemon_SRCS})
-IF(GPROF_DLT_DAEMON)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_DAEMON)
 target_link_libraries(dlt-daemon rt ${CMAKE_THREAD_LIBS_INIT})
 
 install(TARGETS dlt-daemon
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 47bb505..be538db 100755
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -37,25 +37,16 @@
 
 set(dlt_example_user_SRCS dlt-example-user)
 add_executable(dlt-example-user ${dlt_example_user_SRCS})
-IF(GPROF_DLT_EXAMPLES)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_EXAMPLES)
 target_link_libraries(dlt-example-user dlt)
 set_target_properties(dlt-example-user PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_example_user_func_SRCS dlt-example-user-func)
 add_executable(dlt-example-user-func ${dlt_example_user_func_SRCS})
-IF(GPROF_DLT_EXAMPLES)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_EXAMPLES)
 target_link_libraries(dlt-example-user-func dlt)
 set_target_properties(dlt-example-user-func PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_example_filetransfer_SRCS dlt-example-filetransfer)
 add_executable(	dlt-example-filetransfer ${dlt_example_filetransfer_SRCS})
-IF(GPROF_DLT_EXAMPLES)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_EXAMPLES)
 target_link_libraries(dlt-example-filetransfer dlt )
 set_target_properties(dlt-example-filetransfer PROPERTIES LINKER_LANGUAGE C)
 
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index a916683..db87b65 100755
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -38,14 +38,9 @@
 set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c)
 
 add_library(dlt ${dlt_LIB_SRCS})
-
-IF(GPROF_DLT_LIB)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_LIB)
-
 target_link_libraries(dlt rt ${CMAKE_THREAD_LIBS_INIT})
 
-set_target_properties(dlt PROPERTIES VERSION ${PRINT_MAJOR_VERSION}.${PRINT_MINOR_VERSION}.${PRINT_PATCH_LEVEL} SOVERSION ${PRINT_MAJOR_VERSION})
+set_target_properties(dlt PROPERTIES VERSION ${DLT_VERSION} SOVERSION ${DLT_MAJOR_VERSION})
 
 install(TARGETS dlt
 	LIBRARY DESTINATION lib
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index 9b3fc1d..5524316 100755
--- a/src/system/CMakeLists.txt
+++ b/src/system/CMakeLists.txt
@@ -37,9 +37,6 @@
 
 set(dlt_system_SRCS dlt-system dlt-system-log)
 add_executable(dlt-system ${dlt_system_SRCS})
-IF(GPROF_DLT_SYSTEM)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_SYSTEM)
 target_link_libraries(dlt-system dlt)
 set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C)
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index a9add6e..4e21b32 100755
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -37,65 +37,41 @@
 
 set(dlt_test_multi_process_SRCS dlt-test-multi-process)
 add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-multi-process dlt)
 set_target_properties(dlt-test-multi-process PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_multi_process_client_SRCS dlt-test-multi-process-client)
 add_executable(dlt-test-multi-process-client ${dlt_test_multi_process_client_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-multi-process-client dlt)
 set_target_properties(dlt-test-multi-process-client PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_user_SRCS dlt-test-user)
 add_executable(dlt-test-user ${dlt_test_user_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-user dlt)
 set_target_properties(dlt-test-user PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_client_SRCS dlt-test-client)
 add_executable(dlt-test-client ${dlt_test_client_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-client dlt)
 set_target_properties(dlt-test-client PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_stress_user_SRCS dlt-test-stress-user)
 add_executable(dlt-test-stress-user ${dlt_test_stress_user_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-stress-user dlt)
 set_target_properties(dlt-test-stress-user PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_stress_client_SRCS dlt-test-stress-client)
 add_executable(dlt-test-stress-client ${dlt_test_stress_client_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-stress-client dlt)
 set_target_properties(dlt-test-stress-client PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_stress_SRCS dlt-test-stress)
 add_executable(dlt-test-stress ${dlt_test_stress_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-stress dlt)
 set_target_properties(dlt-test-stress PROPERTIES LINKER_LANGUAGE C)
 
 set(dlt_test_filetransfer_SRCS dlt-test-filetransfer)
 add_executable(dlt-test-filetransfer ${dlt_test_filetransfer_SRCS})
-IF(GPROF_DLT_TESTS)
-	SET(CMAKE_C_FLAGS "-pg")
-ENDIF(GPROF_DLT_TESTS)
 target_link_libraries(dlt-test-filetransfer dlt)
 set_target_properties(dlt-test-filetransfer PROPERTIES LINKER_LANGUAGE C)
 
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
new file mode 100644
index 0000000..e071d8a
--- /dev/null
+++ b/systemd/CMakeLists.txt
@@ -0,0 +1,45 @@
+#######
+# Dlt - Diagnostic Log and Trace
+# @licence make begin@
+ #
+ # Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de>
+ # 
+ # This program is free software; you can redistribute it and/or modify it under the terms of the 
+ # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+ # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even 
+ # the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
+ # Public License, version 2.1, for more details.
+ # 
+ # You should have received a copy of the GNU Lesser General Public License, version 2.1, along 
+ # with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ # 
+ # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may 
+ # also be applicable to programs even in cases in which the program is not a library in the technical sense.
+ # 
+ # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may 
+ # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to 
+ # license your linked modules under the GNU Lesser General Public License, version 2.1, you 
+ # may use the program under the following exception.
+ # 
+ # As a special exception, the copyright holders of DLT give you permission to combine DLT 
+ # with software programs or libraries that are released under any license unless such a combination is not
+ # permitted by the license of such a software program or library. You may copy and distribute such a 
+ # system following the terms of the GNU Lesser General Public License, version 2.1, including this
+ # special exception, for DLT and the licenses of the other code concerned.
+ # 
+ # Note that people who make modified versions of DLT are not obligated to grant this special exception 
+ # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, 
+ # version 2.1, gives permission to release a modified version without this exception; this exception 
+ # also makes it possible to release a modified version which carries forward this exception.
+ #
+ # @licence end@
+########
+
+if(WITH_SYSTEMD)
+    SET( DLT_SYSLOG_APPID "SYS" )
+    SET( DLT_SYSLOG_CTID "LOG" )
+    SET( DLT_SYSLOG_PORT 4712 )
+
+    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt.service @ONLY)
+    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service.cmake ${PROJECT_BINARY_DIR}/systemd/dlt-syslog.service @ONLY)
+endif(WITH_SYSTEMD)
diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt
index 3a86293..a5ace1f 100755
--- a/testscripts/CMakeLists.txt
+++ b/testscripts/CMakeLists.txt
@@ -35,3 +35,7 @@
  # @licence end@
 ########
 
+if(WITH_TESTSCRIPTS)
+    configure_file(${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon.cmake ${PROJECT_BINARY_DIR}/testscripts/Meego/dlt-daemon @ONLY)
+    configure_file(${CMAKE_SOURCE_DIR}/testscripts/Ubuntu/dlt-daemon.cmake ${PROJECT_BINARY_DIR}/testscripts/Ubuntu/dlt-daemon @ONLY)
+endif(WITH_TESTSCRIPTS)