From: Samuel Lepetit <samuel.lepetit@inria.fr>
Date: Wed, 13 Jun 2012 16:32:56 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
X-Git-Tag: v3_9_90~569^2~19^2~45
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/344426b96f30e5362d99218279f21bd9966ab497?hp=af28b79e5d8af428e4240cf922e3335030a6f6e5

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26c209a11b..9b442b39f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -362,15 +362,9 @@ add_custom_command(
   COMMENT "Compiling java sources of core library..."					
 )
 
-if(HAVE_TRACING)
-  add_custom_target(java_classes ALL
-    DEPENDS ${JMSG_JAVA_SRC_CLASS}
-  )
-else(HAVE_TRACING)
-  add_custom_command(java_classes ALL
-    DEPENDS ${JTRACE_JAVA_SRC_CLASS} ${JMSG_JAVA_SRC_CLASS}
-  )
-endif(HAVE_TRACING)
+add_custom_target(java_classes ALL
+  DEPENDS ${JAVA_SRC_CLASS}
+)
 
 # simgrid_jar
 add_custom_target(simgrid_jar ALL
@@ -416,11 +410,15 @@ if(HAVE_TRACING)
       DEPENDS ${JAVA_TRACING_EXAMPLES} ${JAVA_EXAMPLES_CLASS}
       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
   )
+  add_custom_target(simgrid_java_examples ALL
+    DEPENDS ${JAVA_EXAMPLES_CLASS} ${JAVA_TRACING_EXAMPLES_CLASS}
+  )
+else(HAVE_TRACING)
+  add_custom_target(simgrid_java_examples ALL
+    DEPENDS ${JAVA_EXAMPLES_CLASS}
+  )
 endif(HAVE_TRACING)
 
-add_custom_target(simgrid_java_examples ALL
-  DEPENDS ${JAVA_EXAMPLES_CLASS} ${JAVA_TRACING_EXAMPLES_CLASS}
-)
 
 ########################
 # Declare dependencies #
@@ -552,6 +550,9 @@ add_dependencies(dist dist-dir)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
   ${CMAKE_HOME_DIRECTORY}/simgrid.jar
 )
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+  ${CMAKE_BINARY_DIR}/simulation.trace
+)
 
 ########
 # NOTE #