X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f281a248565b50fe8c8fd760e70e3f50d4740a3f..fcfe8a7146bbc845782f3f8730f7f4a60a7dd4e8:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 5e8652b047..d32041ac84 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -130,8 +130,8 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ xbt/xbt_matrix.c xbt/xbt_queue.c xbt/xbt_peer.c xbt/xbt_main.c \ xbt/config.c xbt/cunit.c xbt/graphxml_parse.c 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/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 \ xbt/xbt_sg_stubs.c xbt/xbt_os_thread.c \ xbt/xbt_thread_context.c xbt/xbt_ucontext.c \ @@ -163,16 +163,16 @@ 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_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 \ - xbt_sg_stubs.lo $(am__objects_6) $(am__objects_7) + random_mgr.lo surf.lo surfxml_parse.lo cpu.lo network.lo \ + workstation.lo surf_timer.lo workstation_KCCFLN05.lo \ + workstation_ptask_L07.lo 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) @@ -188,8 +188,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) \ @@ -397,8 +396,7 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ xbt/dict_private.h xbt/heap_private.h xbt/fifo_private.h \ xbt/graph_private.h xbt/graphxml_parse.c xbt/graphxml.l \ xbt/graphxml.c 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/xbt_context_factory.h xbt/xbt_jcontext.h xbt/log_private.h \ xbt/ex_interface.h surf/maxmin_private.h \ surf/trace_mgr_private.h surf/surf_private.h \ surf/cpu_private.h surf/workstation_private.h \ @@ -406,7 +404,8 @@ 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/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 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 \ @@ -499,8 +498,9 @@ XBT_SG_SRC = \ xbt/xbt_sg_time.c 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/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 \ xbt/xbt_sg_stubs.c $(am__append_1) $(am__append_2) GTNETS_SRC = \ @@ -542,7 +542,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 @@ -553,14 +552,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 @@ -814,7 +813,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@ @@ -828,6 +826,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_gtnets.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peermanagement.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_mgr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_dns.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_emul.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rl_msg.Plo@am__quote@ @@ -1379,6 +1378,13 @@ trace_mgr.lo: surf/trace_mgr.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 trace_mgr.lo `test -f 'surf/trace_mgr.c' || echo '$(srcdir)/'`surf/trace_mgr.c +random_mgr.lo: surf/random_mgr.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT random_mgr.lo -MD -MP -MF $(DEPDIR)/random_mgr.Tpo -c -o random_mgr.lo `test -f 'surf/random_mgr.c' || echo '$(srcdir)/'`surf/random_mgr.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/random_mgr.Tpo $(DEPDIR)/random_mgr.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='surf/random_mgr.c' object='random_mgr.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 random_mgr.lo `test -f 'surf/random_mgr.c' || echo '$(srcdir)/'`surf/random_mgr.c + surf.lo: surf/surf.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT surf.lo -MD -MP -MF $(DEPDIR)/surf.Tpo -c -o surf.lo `test -f 'surf/surf.c' || echo '$(srcdir)/'`surf/surf.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/surf.Tpo $(DEPDIR)/surf.Plo @@ -1708,13 +1714,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