A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set source level of java to 6 (5 may be enough, but not lower: we use genericity)
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
f12fdfd
..
3e82357
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-222,11
+222,11
@@
endif
SMPI_SRC= \
smpi/smpi_base.c \
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_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
smpi/smpi_util.c \
smpi/smpi_coll.c \
smpi/smpi_mpi_dt.c
@@
-372,7
+372,7
@@
jar_DATA = simgrid.jar
simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
[ -e .classes ] || mkdir .classes
simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
[ -e .classes ] || mkdir .classes
- $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
+ $(JAVAC) -d .classes
-source 6
$(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file))
[ -e .classes/surf ] || mkdir .classes/surf
cp $(srcdir)/surf/simgrid.dtd .classes/surf
$(JAR) cvf simgrid.jar -C .classes .
[ -e .classes/surf ] || mkdir .classes/surf
cp $(srcdir)/surf/simgrid.dtd .classes/surf
$(JAR) cvf simgrid.jar -C .classes .
@@
-380,6
+380,12
@@
else
EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
endif
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
##
## Compile the libs
CLEANFILES=supernovae_sg.c supernovae_gras.c supernovae_smpi.c