X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b30f00857843f1cee60814ed519ff82e8ef4787..5e2dd3ecf166c2d82974beb220aeb8dd4200f105:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 120033faf5..0ff1ac69b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -169,7 +169,23 @@ XBT_SRC=\ \ xbt/config.c \ xbt/cunit.c \ - xbt/graphxml_parse.c + xbt/graphxml_parse.c \ + xbt/setset.c \ + xbt/mmalloc/mm.c + +#### mmalloc cruft -- to be integrated into cmake + +EXTRA_DIST+= \ + xbt/mmalloc/keys.c xbt/mmalloc/mmalloc.c \ + xbt/mmalloc/mm.c xbt/mmalloc/mmprivate.h xbt/mmalloc/mrealloc.c \ + xbt/mmalloc/attach.c xbt/mmalloc/mcalloc.c \ + xbt/mmalloc/mmcheck.c xbt/mmalloc/mmstats.c xbt/mmalloc/mvalloc.c \ + xbt/mmalloc/detach.c xbt/mmalloc/mfree.c xbt/mmalloc/mmap-sup.c \ + xbt/mmalloc/mmemalign.c xbt/mmalloc/mmtrace.c xbt/mmalloc/sbrk-sup.c + +# info_TEXINFOS= xbt/mmalloc/mmalloc.texi + +### End of mmalloc cruft XBT_RL_SRC = \ xbt/xbt_rl_synchro.c \ @@ -190,7 +206,7 @@ SURF_SRC= \ surf/random_mgr.c \ surf/surf.c \ surf/surfxml_parse.c \ - surf/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \ + surf/cpu.c surf/network.c surf/network_constant.c surf/network_vivaldi.c surf/workstation.c \ surf/surf_model_timer.c \ surf/workstation_ptask_L07.c \ surf/cpu_ti.c \ @@ -329,6 +345,12 @@ AMOK_SRC= \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ amok/PeerManagement/peermanagement.c +MC_SRC= \ + mc/mc_memory.c mc/mc_checkpoint.c \ + mc/memory_map.c mc/mc_global.c \ + mc/mc_dfs.c mc/mc_dpor.c \ + mc/mc_transition.c + ############################## # Deal with optional modules # ############################## @@ -348,7 +370,7 @@ lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC) simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \ - $(SIMIX_SRC) $(MSG_SRC) $(SIMDAG_SRC) \ + $(SIMIX_SRC) $(MC_SRC) $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) \ $(TRACING_SRC) @@ -372,10 +394,10 @@ simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module endif -# Windows users (at least, MSVC ones) need a def file. +# Windows users (at least, MSVC ones) need a def file. (and JNI dont like @ cruft added to symbols) if IS_WINDOWS libgras_la_LDFLAGS += -Wl,--output-def,libgras.def -libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def +libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def -Wl,--kill-at libsmpi_la_LDFLAGS += -Wl,--output-def,libsmpi.def endif