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

diff --git a/src/Makefile.am b/src/Makefile.am
index a9f109c774..8611ddfbd2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,11 +32,10 @@ EXTRA_DIST= \
 	xbt/graphxml.c \
 	xbt/graphxml.dtd \
         xbt/xbt_context_private.h \
-        xbt/xbt_context_factory.h \
-        xbt/xbt_jcontext.h \
+        xbt/xbt_context_java.h \
 	xbt/log_private.h \
 	xbt/ex_interface.h \
-        xbt/backtrace_linux.c xbt/backtrace_windows.c \
+        xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \
         \
 	surf/maxmin_private.h \
 	surf/trace_mgr_private.h \
@@ -49,6 +48,7 @@ EXTRA_DIST= \
 	surf/simgrid_dtd.c \
 	surf/simgrid.dtd \
 	surf/network_private.h \
+	surf/network_common.h \
 	surf/network_gtnets_private.h \
 	\
 	include/surf/maxmin.h \
@@ -57,11 +57,13 @@ EXTRA_DIST= \
 	include/surf/surfxml_parse_private.h \
 	include/surf/random_mgr.h \
 	\
+	include/xbt/wine_dbghelp.h \
 	include/xbt/context.h \
 	include/xbt/xbt_os_time.h \
 	include/xbt/xbt_os_thread.h \
 	\
 	msg/private.h \
+	msg/mailbox.h \
 	\
 	simdag/private.h \
 	\
@@ -124,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                                          \
@@ -170,15 +172,15 @@ SURF_SRC= \
   surf/random_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
-  surf/cpu.c   surf/network.c   surf/workstation.c                           \
+  surf/cpu.c   surf/network.c surf/network_constant.c surf/workstation.c     \
   surf/surf_timer.c                                                          \
   surf/workstation_ptask_L07.c                                               \
   xbt/xbt_sg_stubs.c
 
 if CONTEXT_THREADS
-  SURF_SRC +=  xbt/xbt_os_thread.c xbt/xbt_thread_context.c  
+  SURF_SRC +=  xbt/xbt_os_thread.c xbt/xbt_context_thread.c  
 else  
-  SURF_SRC += xbt/xbt_ucontext.c
+  SURF_SRC += xbt/xbt_context_sysv.c
 endif
 
 GTNETS_SRC= \
@@ -215,13 +217,14 @@ MSG_SRC=  msg/msg_config.c \
   msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c
 
 JMSG_C_SRC = \
-  xbt/xbt_jcontext.c \
+  xbt/xbt_context_java.c \
   java/jxbt_utilities.c     java/jxbt_utilities.h      \
   java/jmsg.c               java/jmsg.h                \
   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 java/jmsg_application_handler.h
 
 JMSG_JAVA_SRC = \
   java/simgrid/msg/MsgException.java                 \
@@ -348,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
@@ -379,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 \
@@ -401,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)
@@ -463,8 +453,9 @@ if HAVE_FLEXML
 surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd
 	set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ 
 $(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd
+	rm -f $(top_srcdir)/include/surf/simgrid.h 
 	set -e;                flexml --root-tags platform            -P surfxml --sysid=simgrid.dtd -H $@ -L $^ 
-	mv $(top_srcdir)/include/surf/simgrid.h $@
+	if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi
 	sed 's/extern  *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@
 	sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@