From: mquinson Date: Mon, 6 Aug 2007 12:49:42 +0000 (+0000) Subject: Further fix of win build X-Git-Tag: v3.3~1376 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b986ec78724f4f5d259947d66ef6a184079f384a?hp=b69e984a013e4e9e2d98fc4013cd1721bf2f0245 Further fix of win build git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3984 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/Makefile.am b/src/Makefile.am index 552cc74d8f..2bc7af4da9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,9 +299,13 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +# Please do not add -no-undefined to libsmpi_la_LDFLAGS: +# smpi_simulated_main is indeed defined in user code, and undef in the +# library (no idea why it works under linux, but it fails under windows) libsmpi_la_LIBADD = libsimgrid.la libsmpi_la_SOURCES = $(SMPI_SRC) -libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm +libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm + ## ## Java cruft diff --git a/src/Makefile.in b/src/Makefile.in index e23ca50c60..20177f77da 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -41,13 +41,14 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ @CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c -@HAVE_GTNETS_FALSE@am__append_2 = $(GTNETS_SRC) -@HAVE_SDP_FALSE@am__append_3 = surf/sdp.c -@HAVE_JAVA_TRUE@am__append_4 = libsimgrid4java.la -@HAVE_JAVA_FALSE@am__append_5 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) +@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c +@HAVE_GTNETS_FALSE@am__append_3 = $(GTNETS_SRC) +@HAVE_SDP_FALSE@am__append_4 = surf/sdp.c +@HAVE_JAVA_TRUE@am__append_5 = libsimgrid4java.la +@HAVE_JAVA_FALSE@am__append_6 = $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT) @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT) -@GRAMINE_MODE_FALSE@am__append_6 = $(testall_SOURCES) +@GRAMINE_MODE_FALSE@am__append_7 = $(testall_SOURCES) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/gras_config.h.in $(srcdir)/ucontext_stack.h.in \ $(top_srcdir)/acmacro/dist-files.mk @@ -114,24 +115,24 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \ surf/surfxml_parse.c surf/cpu.c surf/network.c \ surf/workstation.c surf/surf_timer.c surf/network_dassf.c \ surf/workstation_KCCFLN05.c xbt/xbt_os_thread.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/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 \ + xbt/xbt_os_thread_stubs.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/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 \ 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 \ @@ -141,28 +142,29 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c xbt/ex.c \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ amok/PeerManagement/peermanagement.c @CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo -am__objects_7 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \ +@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo +am__objects_8 = maxmin.lo lagrange.lo trace_mgr.lo surf.lo \ surfxml_parse.lo cpu.lo network.lo workstation.lo \ surf_timer.lo network_dassf.lo workstation_KCCFLN05.lo \ - $(am__objects_6) -am__objects_8 = gtnets_simulator.lo gtnets_topology.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_9 = $(am__objects_8) -@HAVE_SDP_TRUE@am__objects_10 = sdp.lo -am__objects_11 = smx_global.lo smx_deployment.lo smx_config.lo \ +@HAVE_GTNETS_TRUE@am__objects_10 = $(am__objects_9) +@HAVE_SDP_TRUE@am__objects_11 = sdp.lo +am__objects_12 = smx_global.lo smx_deployment.lo smx_config.lo \ smx_environment.lo smx_host.lo smx_process.lo smx_action.lo \ smx_synchro.lo -am__objects_12 = context.lo -am__objects_13 = msg_config.lo task.lo host.lo m_process.lo gos.lo \ +am__objects_13 = context.lo +am__objects_14 = msg_config.lo task.lo host.lo m_process.lo gos.lo \ global.lo environment.lo deployment.lo -am__objects_14 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo -am__objects_15 = xbt_sg_synchro.lo xbt_sg_time.lo -am__objects_16 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \ - sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_15) -am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_7) \ - $(am__objects_9) $(am__objects_10) $(am__objects_11) \ - $(am__objects_12) $(am__objects_13) $(am__objects_14) \ - $(am__objects_2) $(am__objects_16) $(am__objects_5) +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 \ + sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16) +am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \ + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ + $(am__objects_13) $(am__objects_14) $(am__objects_15) \ + $(am__objects_2) $(am__objects_17) $(am__objects_5) libsimgrid_la_OBJECTS = $(am_libsimgrid_la_OBJECTS) libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -181,12 +183,13 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ surf/surfxml_parse.c surf/cpu.c surf/network.c \ surf/workstation.c surf/surf_timer.c surf/network_dassf.c \ surf/workstation_KCCFLN05.c xbt/xbt_os_thread.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 \ - java/jxbt_context.c java/jxbt_context.h java/jxbt_utilities.c \ + xbt/xbt_os_thread_stubs.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 java/jxbt_context.c \ + java/jxbt_context.h 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 \ @@ -211,24 +214,24 @@ am__libsimgrid4java_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ xbt/xbt_sg_synchro.c xbt/xbt_sg_time.c amok/amok_base.c \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ amok/PeerManagement/peermanagement.c -am__objects_17 = jxbt_context.lo -am__objects_18 = jxbt_utilities.lo jmsg.lo jmsg_channel.lo \ +am__objects_18 = jxbt_context.lo +am__objects_19 = jxbt_utilities.lo jmsg.lo jmsg_channel.lo \ jmsg_host.lo jmsg_parallel_task.lo jmsg_process.lo \ jmsg_task.lo @HAVE_JAVA_TRUE@am_libsimgrid4java_la_OBJECTS = $(am__objects_1) \ -@HAVE_JAVA_TRUE@ $(am__objects_7) $(am__objects_9) \ -@HAVE_JAVA_TRUE@ $(am__objects_10) $(am__objects_11) \ -@HAVE_JAVA_TRUE@ $(am__objects_17) $(am__objects_18) \ -@HAVE_JAVA_TRUE@ $(am__objects_13) $(am__objects_2) \ -@HAVE_JAVA_TRUE@ $(am__objects_16) $(am__objects_5) +@HAVE_JAVA_TRUE@ $(am__objects_8) $(am__objects_10) \ +@HAVE_JAVA_TRUE@ $(am__objects_11) $(am__objects_12) \ +@HAVE_JAVA_TRUE@ $(am__objects_18) $(am__objects_19) \ +@HAVE_JAVA_TRUE@ $(am__objects_14) $(am__objects_2) \ +@HAVE_JAVA_TRUE@ $(am__objects_17) $(am__objects_5) libsimgrid4java_la_OBJECTS = $(am_libsimgrid4java_la_OBJECTS) libsimgrid4java_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libsimgrid4java_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_JAVA_TRUE@am_libsimgrid4java_la_rpath = -rpath $(libdir) libsmpi_la_DEPENDENCIES = libsimgrid.la -am__objects_19 = smpi_base.lo smpi_mpi.lo -am_libsmpi_la_OBJECTS = $(am__objects_19) +am__objects_20 = smpi_base.lo smpi_mpi.lo +am_libsmpi_la_OBJECTS = $(am__objects_20) libsmpi_la_OBJECTS = $(am_libsmpi_la_OBJECTS) libsmpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -237,12 +240,12 @@ PROGRAMS = $(noinst_PROGRAMS) am__testall_SOURCES_DIST = ./cunit_unit.c ./ex_unit.c ./dynar_unit.c \ ./dict_unit.c ./set_unit.c ./swag_unit.c ./xbt_str_unit.c \ ./config_unit.c simgrid_units_main.c -@GRAMINE_MODE_FALSE@am__objects_20 = cunit_unit.$(OBJEXT) \ +@GRAMINE_MODE_FALSE@am__objects_21 = cunit_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ ex_unit.$(OBJEXT) dynar_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ dict_unit.$(OBJEXT) set_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ swag_unit.$(OBJEXT) xbt_str_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ config_unit.$(OBJEXT) -@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_20) \ +@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_21) \ @GRAMINE_MODE_FALSE@ simgrid_units_main.$(OBJEXT) testall_OBJECTS = $(am_testall_OBJECTS) @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la @@ -443,8 +446,8 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \ msg/private.h simdag/private.h gras/DataDesc/ddt_parse.yy.l \ gras/Virtu/virtu_interface.h \ amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \ - $(am__append_2) $(am__append_3) $(am__append_5) \ - $(am__append_6) + $(am__append_3) $(am__append_4) $(am__append_6) \ + $(am__append_7) #LIBRARY_VERSION= 0:0:0 # | | | @@ -530,7 +533,7 @@ XBT_SG_SRC = \ SURF_SRC = surf/maxmin.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/network_dassf.c \ - surf/workstation_KCCFLN05.c $(am__append_1) + surf/workstation_KCCFLN05.c $(am__append_1) $(am__append_2) GTNETS_SRC = \ surf/gtnets/gtnets_simulator.cc \ surf/gtnets/gtnets_topology.cc \ @@ -627,7 +630,7 @@ AMOK_SRC = \ ### ### Declare the library content ### -lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_4) +lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la $(am__append_5) libgras_la_SOURCES = $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC) libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ @@ -636,9 +639,13 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm + +# Please do not add -no-undefined to libsmpi_la_LDFLAGS: +# smpi_simulated_main is indeed defined in user code, and undef in the +# library (no idea why it works under linux, but it fails under windows) libsmpi_la_LIBADD = libsimgrid.la libsmpi_la_SOURCES = $(SMPI_SRC) -libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm +libsmpi_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm @HAVE_JAVA_TRUE@libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ @HAVE_JAVA_TRUE@ $(SIMIX_SRC) $(JCTX_SRC) \ @HAVE_JAVA_TRUE@ $(JMSG_C_SRC) $(MSG_SRC) \ @@ -885,6 +892,7 @@ 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@ @@ -1414,6 +1422,13 @@ workstation_KCCFLN05.lo: surf/workstation_KCCFLN05.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_KCCFLN05.lo `test -f 'surf/workstation_KCCFLN05.c' || echo '$(srcdir)/'`surf/workstation_KCCFLN05.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 + network_gtnets.lo: surf/network_gtnets.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_gtnets.lo -MD -MP -MF $(DEPDIR)/network_gtnets.Tpo -c -o network_gtnets.lo `test -f 'surf/network_gtnets.c' || echo '$(srcdir)/'`surf/network_gtnets.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/network_gtnets.Tpo $(DEPDIR)/network_gtnets.Plo