X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a282cd526f86a0a40d53e51967237697f7291389..aec1891acd3a43ea3b6c2501ad94239733ee1694:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 638e8c7656..5c4aa27621 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -142,16 +142,17 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ simix/smx_action.c simix/smx_synchro.c xbt/xbt_context.c \ msg/msg_config.c msg/task.c msg/host.c msg/m_process.c \ msg/gos.c msg/global.c msg/environment.c msg/deployment.c \ - simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \ - simdag/sd_workstation.c gras/gras.c gras/Transport/transport.c \ - gras/Transport/transport_private.h gras/Msg/gras_msg_mod.c \ - gras/Msg/gras_msg_types.c gras/Msg/gras_msg_exchange.c \ - gras/Msg/gras_msg_listener.c gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_private.h \ - gras/Virtu/process.c gras/Virtu/gras_module.c \ - gras/DataDesc/ddt_create.c gras/DataDesc/ddt_convert.c \ - gras/DataDesc/ddt_exchange.c gras/DataDesc/cbps.c \ - gras/DataDesc/datadesc.c gras/DataDesc/datadesc_interface.h \ + msg/msg_mailbox.c simdag/sd_global.c simdag/sd_link.c \ + simdag/sd_task.c simdag/sd_workstation.c gras/gras.c \ + gras/Transport/transport.c gras/Transport/transport_private.h \ + gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \ + gras/Msg/gras_msg_exchange.c gras/Msg/gras_msg_listener.c \ + gras/Msg/rpc.c gras/Msg/timer.c gras/Msg/msg_interface.h \ + gras/Msg/msg_private.h gras/Virtu/process.c \ + gras/Virtu/gras_module.c gras/DataDesc/ddt_create.c \ + gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \ + gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \ + gras/DataDesc/datadesc_interface.h \ gras/DataDesc/datadesc_private.h gras/DataDesc/ddt_parse.c \ gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \ gras/Transport/sg_transport.c \ @@ -180,7 +181,7 @@ am__objects_12 = smx_global.lo smx_deployment.lo smx_config.lo \ smx_synchro.lo am__objects_13 = xbt_context.lo am__objects_14 = msg_config.lo task.lo host.lo m_process.lo gos.lo \ - global.lo environment.lo deployment.lo + global.lo environment.lo deployment.lo msg_mailbox.lo am__objects_15 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \ @@ -322,6 +323,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PTH_STACK_GROWTH = @PTH_STACK_GROWTH@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIMGRID_DEP = @SIMGRID_DEP@ @@ -395,16 +397,19 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_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_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 \ - surf/surf_timer_private.h surf/surfxml_parse.c surf/surfxml.l \ - surf/surfxml.c surf/surfxml.dtd surf/network_private.h \ + xbt/ex_interface.h xbt/backtrace_linux.c \ + xbt/backtrace_windows.c xbt/backtrace_dummy.c \ + surf/maxmin_private.h surf/trace_mgr_private.h \ + surf/surf_private.h surf/cpu_private.h \ + surf/workstation_private.h surf/surf_timer_private.h \ + surf/surfxml_parse.c surf/simgrid_dtd.l surf/simgrid_dtd.c \ + surf/simgrid.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/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 \ + include/xbt/wine_dbghelp.h include/xbt/context.h \ + include/xbt/xbt_os_time.h include/xbt/xbt_os_thread.h \ + msg/private.h msg/mailbox.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 \ @@ -532,7 +537,7 @@ SMPI_SRC = \ MSG_SRC = msg/msg_config.c \ msg/task.c msg/host.c msg/m_process.c msg/gos.c \ - msg/global.c msg/environment.c msg/deployment.c + msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c JMSG_C_SRC = \ xbt/xbt_jcontext.c \ @@ -614,6 +619,7 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) $(am__append_8) libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ \ @LD_DYNAMIC_FLAGS@ -lm $(am__append_6) +# -Wl,--entry -Wl,simgrid_version # Please do not add -no-undefined to libsmpi_la_LDFLAGS: # smpi_simulated_main is indeed defined in user code, and undef in the @@ -634,7 +640,7 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \ @GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c \ @GRAMINE_MODE_FALSE@ @builddir@/config_unit.c -@GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/surfxml.h surf/surfxml.c \ +@GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \ @GRAMINE_MODE_FALSE@ ../include/xbt/graphxml.h xbt/graphxml.c \ @GRAMINE_MODE_FALSE@ gras/DataDesc/ddt_parse.yy.c \ @GRAMINE_MODE_FALSE@ $(TEST_UNITS) @builddir@/simgrid_units_main.c @@ -820,6 +826,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mallocator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maxmin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_mailbox.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_gtnets.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peermanagement.Plo@am__quote@ @@ -1585,6 +1592,13 @@ deployment.lo: msg/deployment.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 deployment.lo `test -f 'msg/deployment.c' || echo '$(srcdir)/'`msg/deployment.c +msg_mailbox.lo: msg/msg_mailbox.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msg_mailbox.lo -MD -MP -MF $(DEPDIR)/msg_mailbox.Tpo -c -o msg_mailbox.lo `test -f 'msg/msg_mailbox.c' || echo '$(srcdir)/'`msg/msg_mailbox.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/msg_mailbox.Tpo $(DEPDIR)/msg_mailbox.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='msg/msg_mailbox.c' object='msg_mailbox.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 msg_mailbox.lo `test -f 'msg/msg_mailbox.c' || echo '$(srcdir)/'`msg/msg_mailbox.c + sd_global.lo: simdag/sd_global.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_global.lo -MD -MP -MF $(DEPDIR)/sd_global.Tpo -c -o sd_global.lo `test -f 'simdag/sd_global.c' || echo '$(srcdir)/'`simdag/sd_global.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sd_global.Tpo $(DEPDIR)/sd_global.Plo @@ -2227,11 +2241,11 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @HAVE_JAVA_TRUE@clean-local: @HAVE_JAVA_TRUE@ -rm -rf .classes -@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/surfxml.dtd +@HAVE_JAVA_TRUE@simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd @HAVE_JAVA_TRUE@ [ -e .classes ] || mkdir .classes @HAVE_JAVA_TRUE@ $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) @HAVE_JAVA_TRUE@ [ -e .classes/surf ] || mkdir .classes/surf -@HAVE_JAVA_TRUE@ cp $(srcdir)/surf/surfxml.dtd .classes/surf +@HAVE_JAVA_TRUE@ cp $(srcdir)/surf/simgrid.dtd .classes/surf @HAVE_JAVA_TRUE@ $(JAR) cvf simgrid.jar -C .classes . @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/cunit_unit.c: xbt/cunit.c @@ -2278,17 +2292,18 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l @GRAMINE_MODE_FALSE@ set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^ -@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/surfxml.c: surf/surfxml.l +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@surf/simgrid_dtd.c: surf/simgrid_dtd.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@xbt/graphxml.c: xbt/graphxml.l @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/surfxml.l: $(srcdir)/surf/surfxml.dtd -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml --root-tags platform -P surfxml --sysid=surfxml.dtd -H $@ -L $^ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ mv $(top_srcdir)/include/surf/simgrid.h $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ @@ -2299,10 +2314,10 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ @GRAMINE_MODE_FALSE@@HAVE_FLEXML_TRUE@@MAINTAINER_MODE_TRUE@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected" +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: src/surf/simgrid.dtd was modified, but the flexml program was not detected" @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: Please install it, or if you didn't modify this file, try this:" -@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: touch include/surf/surfxml.h src/surf/surfxml.l" +@GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: touch include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l" @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @exit 1 @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@$(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd @GRAMINE_MODE_FALSE@@HAVE_FLEXML_FALSE@@MAINTAINER_MODE_TRUE@ @echo "ERROR: src/xbt/graphxml.dtd was modified, but the flexml program was not detected"