X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ebae77b3368f80b11c681c2d03ade654038087d2..58944921dc52367edb9be46cded4b6d4f59ffd52:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 6e20976094..9d581473d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,6 +66,7 @@ EXTRA_DIST= \ \ simdag/private.h \ simdag/dax.dtd \ + simdag/dax_dtd.l \ simdag/dax_dtd.h \ simdag/dax_dtd.c \ \ @@ -194,10 +195,6 @@ SURF_SRC= \ surf/cpu_im.c \ xbt/xbt_sg_stubs.c -if CONTEXT_THREADS - SURF_SRC += xbt/xbt_os_thread.c -endif - GTNETS_SRC= \ surf/gtnets/gtnets_simulator.cc \ surf/gtnets/gtnets_topology.cc \ @@ -216,18 +213,20 @@ SIMIX_SRC= \ simix/smx_network.c if CONTEXT_THREADS - SURF_SRC += simix/smx_context_thread.c + SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c + EXTRA_DIST += simix/smx_context_sysv.c else SURF_SRC += simix/smx_context_sysv.c + EXTRA_DIST += xbt/xbt_os_thread.c simix/smx_context_thread.c endif SMPI_SRC= \ smpi/smpi_base.c \ + smpi/smpi_comm.c \ + smpi/smpi_group.c \ smpi/smpi_bench.c \ smpi/smpi_global.c \ smpi/smpi_mpi.c \ - smpi/smpi_sender.c \ - smpi/smpi_receiver.c \ smpi/smpi_util.c \ smpi/smpi_coll.c \ smpi/smpi_mpi_dt.c @@ -381,6 +380,12 @@ else EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC) endif +LUA_SRC= simix/smx_context_lua.c bindings/lua/Msglua.c +if HAVE_LUA + simgrid_sources += $(LUA_SRC) +else + EXTRA_DIST += $(LUA_SRC) +endif ## ## Compile the libs CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c