X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7516e3d43bd243928406a631bc5c9e89b2789f04..b986ec78724f4f5d259947d66ef6a184079f384a:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 08bec14a0e..2bc7af4da9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ -AM_CFLAGS+= -g @GTNETS_CFLAGS@ +#AM_CPPFLAGS= +AM_CFLAGS= -g #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -48,7 +49,7 @@ EXTRA_DIST= \ include/surf/surf.h \ include/surf/surfxml_parse_private.h \ \ - include/xbt/xbt_portability.h \ + include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ include/xbt/context.h \ \ @@ -56,11 +57,15 @@ EXTRA_DIST= \ \ simdag/private.h \ \ + gras/DataDesc/ddt_parse.yy.l \ + gras/Virtu/virtu_interface.h \ amok/Bandwidth/bandwidth_private.h \ amok/amok_modinter.h \ include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h + simix/msg_simix_private.h \ + \ + smpi/private.h smpi/smpi.h #LIBRARY_VERSION= 0:0:0 # | | | @@ -113,7 +118,7 @@ XBT_SRC=\ xbt_modinter.h gras_modinter.h \ xbt/xbt_virtu.c \ \ - xbt/sysdep.c \ + xbt/xbt_os_time.c \ xbt/asserts.c \ xbt/log.c xbt/xbt_log_appender_file.c \ xbt/xbt_log_layout_simple.c xbt/xbt_log_layout_format.c \ @@ -127,12 +132,24 @@ XBT_SRC=\ xbt/graph.c \ xbt/set.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 +XBT_RL_SRC = \ + xbt/xbt_rl_synchro.c \ + xbt/xbt_rl_time.c +XBT_SG_SRC = \ + xbt/xbt_sg_synchro.c \ + xbt/xbt_sg_time.c + SURF_SRC= \ surf/maxmin.c \ surf/lagrange.c \ @@ -144,6 +161,12 @@ SURF_SRC= \ surf/network_dassf.c \ surf/workstation_KCCFLN05.c +if CONTEXT_THREADS + SURF_SRC += xbt/xbt_os_thread.c +else + SURF_SRC += xbt/xbt_os_thread_stubs.c +endif + GTNETS_SRC= \ surf/gtnets/gtnets_simulator.cc \ surf/gtnets/gtnets_topology.cc \ @@ -152,7 +175,7 @@ GTNETS_SRC= \ # Separated because we don't want it in libsimgrid4java CTX_SRC= xbt/context.c -JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c +JCTX_SRC= java/jxbt_context.c java/jxbt_context.h SIMIX_SRC= \ simix/smx_global.c \ @@ -164,6 +187,10 @@ SIMIX_SRC= \ simix/smx_action.c \ simix/smx_synchro.c +SMPI_SRC= \ + smpi/smpi_base.c \ + smpi/smpi_mpi.c + 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 @@ -197,8 +224,10 @@ SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_works GRAS_COMMON_SRC= \ gras/gras.c \ gras/Transport/transport.c gras/Transport/transport_private.h \ - gras/Msg/msg.c gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_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 \ \ @@ -215,19 +244,23 @@ GRAS_RL_SRC= \ gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \ \ gras/Virtu/rl_emul.c \ - gras/Virtu/rl_process.c gras/Virtu/rl_time.c \ + gras/Virtu/rl_process.c \ gras/Virtu/rl_dns.c\ \ gras/Msg/rl_msg.c +GRAS_RL_SRC+=$(XBT_RL_SRC) + GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ \ gras/Virtu/sg_emul.c \ - gras/Virtu/sg_process.c gras/Virtu/sg_time.c \ + gras/Virtu/sg_process.c \ gras/Virtu/sg_dns.c\ \ gras/Msg/sg_msg.c +GRAS_SG_SRC+=$(XBT_SG_SRC) + AMOK_SRC= \ amok/amok_base.c \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ @@ -237,7 +270,7 @@ AMOK_SRC= \ # Deal with optional modules # ############################## -if USE_GTNETS +if HAVE_GTNETS GTNETS_USED=$(GTNETS_SRC) else GTNETS_USED= @@ -255,16 +288,24 @@ endif ### Declare the library content ### -lib_LTLIBRARIES= libsimgrid.la libgras.la +lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la 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 +libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(CTX_SRC) \ $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +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 = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm + ## ## Java cruft @@ -275,8 +316,8 @@ lib_LTLIBRARIES += libsimgrid4java.la libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(JCTX_SRC) \ $(JMSG_C_SRC) $(MSG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm + $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) +libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid4java_la_GCJFLAGS = -fjni clean-local: