Replaced generation of builtin.c with using a builtin.c template

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3709 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 7 insertions, 8 deletions

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index ada2c6778..a4e9251d9 100644
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -40,6 +40,8 @@ foreach ( MODULE_PATH ${ALL_MODULES})
       message("Disabled  ${MODULE_PATH} ( ${${MODULE_PATH}_REASON} )")
    endif()
 endforeach()
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/builtin.c.in ${CMAKE_CURRENT_BINARY_DIR}/builtin.c)
+
 
 message( "")
 
@@ -85,14 +87,6 @@ ADD_CUSTOM_TARGET(
 )
 
 ADD_CUSTOM_COMMAND(
-  OUTPUT builtin.c
-  COMMAND echo ${MODULES_PROTOTYPE} >  ${CMAKE_CURRENT_BINARY_DIR}/builtin.c
-  COMMAND echo extern void builtin_init(void)\; void builtin_init(void) { >>  ${CMAKE_CURRENT_BINARY_DIR}/builtin.c
-  COMMAND echo "${MODULES_FUNC};" >>  ${CMAKE_CURRENT_BINARY_DIR}/builtin.c
-  COMMAND echo "}" >>  ${CMAKE_CURRENT_BINARY_DIR}/builtin.c
-)
-
-ADD_CUSTOM_COMMAND(
   OUTPUT navit.xml
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml
   COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navit.xml
diff --git a/navit/builtin.c.in b/navit/builtin.c.in
new file mode 100644
index 000000000..86bcc6089
--- /dev/null
+++ b/navit/builtin.c.in
@@ -0,0 +1,5 @@
+${MODULES_PROTOTYPE}
+extern void builtin_init(void); 
+void builtin_init(void) { 
+    ${MODULES_FUNC};
+}