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

[simgrid.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 710093b..c7f6d55 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -52,12 +52,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c        \
-@CONTEXT_THREADS_TRUE@              xbt/xbt_thread_context.c  
-
-@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c  \
-@CONTEXT_THREADS_FALSE@              xbt/xbt_ucontext.c
-
+@CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c xbt/xbt_thread_context.c  
+@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_ucontext.c
 @HAVE_GTNETS_FALSE@am__append_3 = $(GTNETS_SRC)
 @HAVE_SDP_FALSE@am__append_4 = surf/sdp.c
 
@@ -137,8 +133,8 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.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 \
-       xbt/xbt_os_thread.c xbt/xbt_thread_context.c \
-       xbt/xbt_os_thread_stubs.c xbt/xbt_ucontext.c \
+       xbt/xbt_sg_stubs.c xbt/xbt_os_thread.c \
+       xbt/xbt_thread_context.c xbt/xbt_ucontext.c \
        surf/gtnets/gtnets_simulator.cc surf/gtnets/gtnets_topology.cc \
        surf/gtnets/gtnets_interface.cc surf/network_gtnets.c \
        surf/sdp.c simix/smx_global.c simix/smx_deployment.c \
@@ -167,17 +163,15 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
        amok/PeerManagement/peermanagement.c 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_host.c java/jmsg_host.h java/jmsg_process.c \
        java/jmsg_process.h java/jmsg_task.c java/jmsg_task.h
 @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo \
 @CONTEXT_THREADS_TRUE@ xbt_thread_context.lo
-@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo \
-@CONTEXT_THREADS_FALSE@        xbt_ucontext.lo
+@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_ucontext.lo
 am__objects_8 = maxmin.lo fair_bottleneck.lo lagrange.lo trace_mgr.lo \
        surf.lo surfxml_parse.lo cpu.lo network.lo workstation.lo \
        surf_timer.lo workstation_KCCFLN05.lo workstation_ptask_L07.lo \
-       $(am__objects_6) $(am__objects_7)
+       xbt_sg_stubs.lo $(am__objects_6) $(am__objects_7)
 am__objects_9 = gtnets_simulator.lo gtnets_topology.lo \
        gtnets_interface.lo network_gtnets.lo
 @HAVE_GTNETS_TRUE@am__objects_10 = $(am__objects_9)
@@ -193,8 +187,7 @@ am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo
 am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
        sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
 am__objects_18 = xbt_jcontext.lo jxbt_utilities.lo jmsg.lo \
-       jmsg_channel.lo jmsg_host.lo jmsg_parallel_task.lo \
-       jmsg_process.lo jmsg_task.lo
+       jmsg_channel.lo jmsg_host.lo jmsg_process.lo jmsg_task.lo
 @HAVE_JAVA_TRUE@am__objects_19 = $(am__objects_18)
 am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
        $(am__objects_10) $(am__objects_11) $(am__objects_12) \
@@ -411,11 +404,11 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
        surf/surfxml.c surf/surfxml.dtd surf/network_private.h \
        surf/network_gtnets_private.h include/surf/maxmin.h \
        include/surf/trace_mgr.h include/surf/surf.h \
-       include/surf/surfxml_parse_private.h include/xbt/xbt_os_time.h \
-       include/xbt/xbt_os_thread.h msg/private.h simdag/private.h \
-       gras/DataDesc/ddt_parse.yy.l gras/Virtu/virtu_rl.h \
-       gras/Virtu/virtu_sg.h gras/Virtu/virtu_interface.h \
-       gras/Virtu/virtu_private.h \
+       include/surf/surfxml_parse_private.h include/xbt/context.h \
+       include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \
+       msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \
+       gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \
+       gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h \
        gras/Transport/transport_interface.h \
        amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
        include/simix/simix.h include/simix/datatypes.h \
@@ -507,7 +500,7 @@ SURF_SRC = surf/maxmin.c surf/fair_bottleneck.c surf/lagrange.c \
        surf/trace_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 \
-       $(am__append_1) $(am__append_2)
+       xbt/xbt_sg_stubs.c $(am__append_1) $(am__append_2)
 GTNETS_SRC = \
   surf/gtnets/gtnets_simulator.cc \
   surf/gtnets/gtnets_topology.cc  \
@@ -547,7 +540,6 @@ JMSG_C_SRC = \
   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
 
@@ -558,14 +550,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
 
@@ -819,7 +811,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_channel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_host.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_parallel_task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_process.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_task.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_utilities.Plo@am__quote@
@@ -893,12 +884,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_matrix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_thread_stubs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_os_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_peer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_queue.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_rl_synchro.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_rl_time.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_stubs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_synchro.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_time.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str.Plo@am__quote@
@@ -1440,6 +1431,13 @@ workstation_ptask_L07.lo: surf/workstation_ptask_L07.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workstation_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.c
 
+xbt_sg_stubs.lo: xbt/xbt_sg_stubs.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sg_stubs.lo -MD -MP -MF $(DEPDIR)/xbt_sg_stubs.Tpo -c -o xbt_sg_stubs.lo `test -f 'xbt/xbt_sg_stubs.c' || echo '$(srcdir)/'`xbt/xbt_sg_stubs.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_sg_stubs.Tpo $(DEPDIR)/xbt_sg_stubs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_sg_stubs.c' object='xbt_sg_stubs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sg_stubs.lo `test -f 'xbt/xbt_sg_stubs.c' || echo '$(srcdir)/'`xbt/xbt_sg_stubs.c
+
 xbt_thread_context.lo: xbt/xbt_thread_context.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_thread_context.lo -MD -MP -MF $(DEPDIR)/xbt_thread_context.Tpo -c -o xbt_thread_context.lo `test -f 'xbt/xbt_thread_context.c' || echo '$(srcdir)/'`xbt/xbt_thread_context.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_thread_context.Tpo $(DEPDIR)/xbt_thread_context.Plo
@@ -1447,13 +1445,6 @@ xbt_thread_context.lo: xbt/xbt_thread_context.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_thread_context.lo `test -f 'xbt/xbt_thread_context.c' || echo '$(srcdir)/'`xbt/xbt_thread_context.c
 
-xbt_os_thread_stubs.lo: xbt/xbt_os_thread_stubs.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_thread_stubs.lo -MD -MP -MF $(DEPDIR)/xbt_os_thread_stubs.Tpo -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_os_thread_stubs.Tpo $(DEPDIR)/xbt_os_thread_stubs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='xbt/xbt_os_thread_stubs.c' object='xbt_os_thread_stubs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
-
 xbt_ucontext.lo: xbt/xbt_ucontext.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_ucontext.lo -MD -MP -MF $(DEPDIR)/xbt_ucontext.Tpo -c -o xbt_ucontext.lo `test -f 'xbt/xbt_ucontext.c' || echo '$(srcdir)/'`xbt/xbt_ucontext.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/xbt_ucontext.Tpo $(DEPDIR)/xbt_ucontext.Plo
@@ -1713,13 +1704,6 @@ jmsg_host.lo: java/jmsg_host.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
 
-jmsg_parallel_task.lo: java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_parallel_task.lo -MD -MP -MF $(DEPDIR)/jmsg_parallel_task.Tpo -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_parallel_task.Tpo $(DEPDIR)/jmsg_parallel_task.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='java/jmsg_parallel_task.c' object='jmsg_parallel_task.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
-
 jmsg_process.lo: java/jmsg_process.c
 @am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_process.lo -MD -MP -MF $(DEPDIR)/jmsg_process.Tpo -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/jmsg_process.Tpo $(DEPDIR)/jmsg_process.Plo