metaxml example modifications

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 25a45af..78f4659 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,8 +33,6 @@ EXTRA_DIST= \
        xbt/graphxml.dtd \
         xbt/xbt_context_private.h \
         xbt/xbt_context_factory.h \
-        xbt/xbt_thread_context.h \
-        xbt/xbt_ucontext.h \
         xbt/xbt_jcontext.h \
        xbt/log_private.h \
        xbt/ex_interface.h \
@@ -56,7 +54,9 @@ EXTRA_DIST= \
        include/surf/trace_mgr.h \
        include/surf/surf.h \
        include/surf/surfxml_parse_private.h \
+       include/surf/random_mgr.h \
        \
+       include/xbt/context.h \
        include/xbt/xbt_os_time.h \
        include/xbt/xbt_os_thread.h \
        \
@@ -166,16 +166,18 @@ SURF_SRC= \
   surf/fair_bottleneck.c                                                              \
   surf/lagrange.c                                                            \
   surf/trace_mgr.c                                                           \
+  surf/random_mgr.c                                                           \
   surf/surf.c                                                                \
   surf/surfxml_parse.c                                                       \
   surf/cpu.c   surf/network.c   surf/workstation.c                           \
   surf/surf_timer.c                                                          \
-  surf/workstation_KCCFLN05.c   surf/workstation_ptask_L07.c
+  surf/workstation_KCCFLN05.c   surf/workstation_ptask_L07.c                 \
+  xbt/xbt_sg_stubs.c
 
 if CONTEXT_THREADS
-  SURF_SRC += xbt/xbt_os_thread.c
+  SURF_SRC +=  xbt/xbt_os_thread.c xbt/xbt_thread_context.c  
 else  
-  SURF_SRC += xbt/xbt_os_thread_stubs.c
+  SURF_SRC += xbt/xbt_ucontext.c
 endif
 
 GTNETS_SRC= \
@@ -212,11 +214,11 @@ MSG_SRC=  msg/msg_config.c \
   msg/global.c msg/environment.c msg/deployment.c 
 
 JMSG_C_SRC = \
+  xbt/xbt_jcontext.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_parallel_task.c java/jmsg_parallel_task.h  \
   java/jmsg_process.c       java/jmsg_process.h        \
   java/jmsg_task.c          java/jmsg_task.h
 
@@ -227,14 +229,14 @@ JMSG_JAVA_SRC = \
   java/simgrid/msg/HostNotFoundException.java        \
   java/simgrid/msg/ProcessNotFoundException.java     \
   \
+  java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Process.java                      \
-  java/simgrid/msg/DTDResolver.java                  \
-  java/simgrid/msg/ApplicationHandler.java           \
-  java/simgrid/msg/Channel.java                      \
   java/simgrid/msg/Host.java                         \
-  java/simgrid/msg/Msg.java                          \
   java/simgrid/msg/Task.java                         \
-  java/simgrid/msg/ParallelTask.java                 \
+  \
+  java/simgrid/msg/MsgNative.java                    \
+  java/simgrid/msg/DTDResolver.java                  \
+  java/simgrid/msg/ApplicationHandler.java           \
   \
   java/simgrid/msg/Sem.java
 
@@ -337,7 +339,10 @@ endif
 ## Java cruft
 
 EXTRA_DIST+=$(JMSG_JAVA_SRC)
+
 if HAVE_JAVA
+libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
+
 clean-local:
        -rm -rf .classes