X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=cmake%2FCMakeDA.cmake;h=4255e5243fc83eeb2c40f8f31e7643edf5bd8014;hp=33b96ba4400ed39b715d43c58f3b159576fdec6d;hb=0742852a1ff5e76852a37253bdd8e14c80a4da0f;hpb=651ed7829f00337fb60f84f86b2496fe9bbe3963

diff --git a/cmake/CMakeDA.cmake b/cmake/CMakeDA.cmake
index 33b96ba4400..4255e5243fc 100644
--- a/cmake/CMakeDA.cmake
+++ b/cmake/CMakeDA.cmake
@@ -112,7 +112,7 @@ foreach(detector ${ONLINEDETECTORS} )
 
   set(ALIROOTALIBS)
 
-  list(APPEND ALIROOTALIBS RAWDatabase_a RAWDatarec_a RAWDatasim_a STEERBase_a STEER_a CDB_a ESD_a STAT_a AOD_a )
+  list(APPEND ALIROOTALIBS RAWDatabase-static RAWDatarec-static RAWDatasim-static STEERBase-static STEER-static CDB-static ESD-static STAT-static AOD-static )
 
   expand(ALIROOTALIBS2 "\${${DAMODULE}ALIBS}")
   expand(DAINCDIRS "\${${DAMODULE}INC}")
@@ -189,16 +189,20 @@ foreach(detector ${ONLINEDETECTORS} )
 
 	  set(ZIP)
 	  foreach(_lib ${ALIROOTALIBS})
-	   string(REGEX REPLACE "-all" "_a" _lib ${_lib})
+	   string(REGEX REPLACE "-static" "" _lib ${_lib})
 	   list(APPEND ZIP && ar x "../lib${_lib}.a")
 	  endforeach(_lib)
  	  list (APPEND ZIP && ar r "../lib${DALIB}.a" "*.o")
 
-	  add_custom_target( ${DALIB} COMMAND rm -rf junk && mkdir -p junk 
-				COMMAND cd junk ${ZIP}
-				COMMAND cd ../ && rm -rf junk
+	  add_custom_target( ${DALIB} COMMAND rm -rf junk${DAEXE} && mkdir -p junk${DAEXE} 
+				COMMAND cd junk${DAEXE} ${ZIP}
+				COMMAND cd ../ && rm -rf junk${DAEXE}
 				DEPENDS ${ALIROOTALIBS}
 				WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+	  add_custom_command( TARGET clean
+	                     COMMAND rm -rf junk${DAEXE}
+			     WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+	    
 
 	  add_custom_target(${DATARGETNAME})
 	  add_executable(${DAEXE} ${DASRC})