[Initng-svn] r3764 - in initng-ifiles/trunk: .

[svn at initng.thinktux.net]

Author: biebl
Date: Tue Apr 11 21:00:59 2006
New Revision: 3764

Modified:
   initng-ifiles/trunk/CMakeLists.txt
   initng-ifiles/trunk/cmake/InitngMacros.cmake

Log:
- Add the pseudo target "ifiles" which depends on install_service and the output of the processed iifiles. This way, the ifiles are only regenerated if install_service or the corresponding iifile changes.
- Remove ifiles on "make clean".
- Install gen_system_runlevel to /sbin


Modified: initng-ifiles/trunk/CMakeLists.txt
==============================================================================
--- initng-ifiles/trunk/CMakeLists.txt	(original)
+++ initng-ifiles/trunk/CMakeLists.txt	Tue Apr 11 21:00:59 2006
@@ -29,6 +29,8 @@
 	ADD_SUBDIRECTORY(fixes)
 ENDIF(INSTALL_FIXES)
 
+INSTALL_PROGRAMS(/sbin FILES gen_system_runlevel)
+
 CONFIGURE_FILE(
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
         "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

Modified: initng-ifiles/trunk/cmake/InitngMacros.cmake
==============================================================================
--- initng-ifiles/trunk/cmake/InitngMacros.cmake	(original)
+++ initng-ifiles/trunk/cmake/InitngMacros.cmake	Tue Apr 11 21:00:59 2006
@@ -1,19 +1,24 @@
 MACRO(PROCESS_IIFILES _i_FILES)
 	# reset the variable
 	SET(${_i_FILES})
-	
 	FOREACH(_current_FILE ${ARGN})
 		GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
 		GET_FILENAME_COMPONENT(_abs_PATH ${_tmp_FILE} PATH)
 		GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
 		SET(_i_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.i)
-		ADD_CUSTOM_TARGET(${_basename} ALL
-			COMMAND echo "Processing: ${_current_FILE}"
-			COMMAND ${CMAKE_BINARY_DIR}/tools/install_service -i ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -o ${_i_FILE} 2> /dev/null
-			DEPENDS ${_current_FILE})
-		ADD_DEPENDENCIES(${_basename} install_service)
+		
+		ADD_CUSTOM_COMMAND(OUTPUT ${_i_FILE}
+			COMMAND ${CMAKE_BINARY_DIR}/tools/install_service 
+			ARGS -i ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} -o ${_i_FILE} 2> /dev/null
+			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${CMAKE_BINARY_DIR}/tools/install_service)
+		
 		SET(${_i_FILES} ${${_i_FILES}} ${_i_FILE})
 			
 	ENDFOREACH(_current_FILE)
-	#MACRO_ADDITIONAL_CLEAN_FILES(${_i_FILES})
+
+	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_CLEAN_FILES ${_i_FILES})
+
+	ADD_CUSTOM_TARGET(ifiles ALL 
+		DEPENDS ${${_i_FILES}})	
+
 ENDMACRO(PROCESS_IIFILES)