X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c382a9ec9ddb51b131771f0d66e2bcee6ce7eec7..e5e5accbefb1b4a360da4247ce287d1466b0f352:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5156b6124e..5562273fc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST= \
 	xbt/graphxml.c \
 	xbt/graphxml.dtd \
         xbt/xbt_context_private.h \
-        xbt/xbt_context_factory.h \
         xbt/xbt_context_java.h \
 	xbt/log_private.h \
 	xbt/ex_interface.h \
@@ -127,7 +126,7 @@ VERSION_INFO= -version-info 2:0:0
 
 XBT_SRC=\
   \
-  xbt/snprintf.c    xbt/xbt_str.c xbt/xbt_strbuff.c                          \
+  xbt/snprintf.c    xbt/xbt_str.c xbt/xbt_strbuff.c  xbt/xbt_sha.c           \
   xbt/ex.c                                                                   \
   \
   xbt_modinter.h    gras_modinter.h                                          \
@@ -224,7 +223,8 @@ JMSG_C_SRC = \
   java/jmsg_channel.c       java/jmsg_channel.h        \
   java/jmsg_host.c          java/jmsg_host.h           \
   java/jmsg_process.c       java/jmsg_process.h        \
-  java/jmsg_task.c          java/jmsg_task.h
+  java/jmsg_task.c          java/jmsg_task.h           \
+  java/jmsg_application_handler.c
 
 JMSG_JAVA_SRC = \
   java/simgrid/msg/MsgException.java                 \
@@ -351,7 +351,7 @@ libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 clean-local:
 	-rm -rf .classes
 
-jardir = $(prefix)/jar 
+jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
 
 simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
@@ -382,11 +382,11 @@ else
 noinst_PROGRAMS=testall
 TEST_CFILES=xbt/cunit.c  xbt/ex.c          \
             xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \
-	    xbt/xbt_str.c                      \
+	    xbt/xbt_str.c  xbt/xbt_sha.c                \
             xbt/config.c 
-TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c         \
-            @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
-	    @builddir@/xbt_str_unit.c \
+TEST_UNITS= @builddir@/cunit_unit.c   @builddir@/ex_unit.c         \
+            @builddir@/dynar_unit.c   @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \
+	    @builddir@/xbt_str_unit.c @builddir@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\
             @builddir@/config_unit.c 
 
 BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
@@ -404,21 +404,8 @@ EXTRA_DIST+=$(testall_SOURCES)
 if MAINTAINER_MODE
 CLEANFILES=$(TEST_UNITS)
 
-@builddir@/cunit_unit.c: xbt/cunit.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/ex_unit.c: xbt/ex.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/xbt_str_unit.c: xbt/xbt_str.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dynar_unit.c: xbt/dynar.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/dict_unit.c: xbt/dict.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/set_unit.c: xbt/set.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/swag_unit.c: xbt/swag.c
-	@top_srcdir@/tools/sg_unit_extractor.pl $^
-@builddir@/config_unit.c: xbt/config.c
+$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\
+               xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c
 	@top_srcdir@/tools/sg_unit_extractor.pl $^
 
 @builddir@/simgrid_units_main.c: $(TEST_UNITS)