Rename xbt/xbt_context.h to xbt/context.h, and add src/include/xbt/context.h to the...

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index ba7cc9c..afc5453 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,11 @@ EXTRA_DIST= \
        xbt/graphxml.l \
        xbt/graphxml.c \
        xbt/graphxml.dtd \
-        xbt/context_private.h \
+        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 \
         \
@@ -53,9 +57,9 @@ EXTRA_DIST= \
        include/surf/surf.h \
        include/surf/surfxml_parse_private.h \
        \
+       include/xbt/context.h \
        include/xbt/xbt_os_time.h \
        include/xbt/xbt_os_thread.h \
-       include/xbt/context.h \
        \
        msg/private.h \
        \
@@ -167,12 +171,13 @@ SURF_SRC= \
   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= \
@@ -181,9 +186,9 @@ GTNETS_SRC= \
   surf/gtnets/gtnets_interface.cc \
   surf/network_gtnets.c
 
-# Separated because we don't want it in libsimgrid4java
-CTX_SRC= xbt/context.c
-JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
+# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit()
+# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library 
+CTX_SRC= xbt/xbt_context.c
 
 SIMIX_SRC= \
   simix/smx_global.c \
@@ -209,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
 
@@ -224,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
 
@@ -334,15 +339,9 @@ endif
 ## Java cruft
 
 EXTRA_DIST+=$(JMSG_JAVA_SRC)
-if HAVE_JAVA
-lib_LTLIBRARIES += libsimgrid4java.la
 
-libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
-                             $(SIMIX_SRC) $(JCTX_SRC) \
-                             $(JMSG_C_SRC) $(MSG_SRC) \
-                            $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-libsimgrid4java_la_GCJFLAGS = -fjni
+if HAVE_JAVA
+libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 
 clean-local:
        -rm -rf .classes
@@ -357,7 +356,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd
        cp $(srcdir)/surf/surfxml.dtd .classes/surf
        $(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
 endif
 
 if GRAMINE_MODE