Remove trailing space to jardir definition since it sometimes survives and create...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 25c9f5f..3d3d312 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,8 +32,7 @@ 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_dummy.c \
@@ -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 \
@@ -126,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                                          \
@@ -172,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= \
@@ -217,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
 
 JMSG_JAVA_SRC = \
   java/simgrid/msg/MsgException.java                 \
@@ -350,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
@@ -381,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_sha_unit.c\
             @builddir@/config_unit.c 
 
 BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \
@@ -409,6 +410,8 @@ CLEANFILES=$(TEST_UNITS)
        @top_srcdir@/tools/sg_unit_extractor.pl $^
 @builddir@/xbt_str_unit.c: xbt/xbt_str.c
        @top_srcdir@/tools/sg_unit_extractor.pl $^
+@builddir@/xbt_sha_unit.c: xbt/xbt_sha.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
@@ -465,7 +468,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 $^ 
+       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 $@