X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3347e271cd0ddb7da133ad0e66826cb559e1dd14..e132cf1053def55779a6a2a1d5944fc8f9c070ab:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 3f5b6834b0..d10e4aaf91 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -131,28 +131,28 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.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/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_ptask_L07.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 simix/smx_config.c \ - simix/smx_environment.c simix/smx_host.c simix/smx_process.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 \ - 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 \ + surf/network.c surf/network_constant.c surf/workstation.c \ + surf/surf_timer.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 \ + 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 \ + simix/smx_config.c simix/smx_environment.c simix/smx_host.c \ + simix/smx_process.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 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 \ @@ -170,8 +170,9 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ @CONTEXT_THREADS_FALSE@am__objects_7 = xbt_ucontext.lo am__objects_8 = maxmin.lo fair_bottleneck.lo lagrange.lo trace_mgr.lo \ random_mgr.lo surf.lo surfxml_parse.lo cpu.lo network.lo \ - workstation.lo surf_timer.lo workstation_ptask_L07.lo \ - xbt_sg_stubs.lo $(am__objects_6) $(am__objects_7) + network_constant.lo workstation.lo surf_timer.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) @@ -278,6 +279,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ DOXYGEN = @DOXYGEN@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -312,6 +314,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ +NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -398,19 +401,21 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ 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 xbt/backtrace_linux.c \ - xbt/backtrace_windows.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 \ + 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_common.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/wine_dbghelp.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 \ + 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 \ gras/Transport/transport_interface.h \ amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \ include/simix/simix.h include/simix/datatypes.h \ @@ -501,7 +506,7 @@ XBT_SG_SRC = \ SURF_SRC = surf/maxmin.c 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/network_constant.c surf/workstation.c surf/surf_timer.c \ surf/workstation_ptask_L07.c xbt/xbt_sg_stubs.c \ $(am__append_1) $(am__append_2) GTNETS_SRC = \ @@ -617,6 +622,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 @@ -705,8 +711,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -714,8 +720,8 @@ uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -825,6 +831,7 @@ distclean-compile: @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_constant.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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Plo@am__quote@ @@ -1414,6 +1421,13 @@ network.lo: surf/network.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 network.lo `test -f 'surf/network.c' || echo '$(srcdir)/'`surf/network.c +network_constant.lo: surf/network_constant.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network_constant.lo -MD -MP -MF $(DEPDIR)/network_constant.Tpo -c -o network_constant.lo `test -f 'surf/network_constant.c' || echo '$(srcdir)/'`surf/network_constant.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/network_constant.Tpo $(DEPDIR)/network_constant.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='surf/network_constant.c' object='network_constant.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 network_constant.lo `test -f 'surf/network_constant.c' || echo '$(srcdir)/'`surf/network_constant.c + workstation.lo: surf/workstation.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT workstation.lo -MD -MP -MF $(DEPDIR)/workstation.Tpo -c -o workstation.lo `test -f 'surf/workstation.c' || echo '$(srcdir)/'`surf/workstation.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/workstation.Tpo $(DEPDIR)/workstation.Plo @@ -1974,8 +1988,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1987,8 +2001,8 @@ TAGS: $(HEADERS) $(SOURCES) gras_config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1998,13 +2012,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) gras_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) gras_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -2299,8 +2312,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @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@ rm -f $(top_srcdir)/include/surf/simgrid.h @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@ if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi @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 $@