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
Add mmalloc to cmake
[simgrid.git]
/
examples
/
amok
/
Makefile.am
diff --git
a/examples/amok/Makefile.am
b/examples/amok/Makefile.am
index
9a2d98b
..
70724b3
100644
(file)
--- a/
examples/amok/Makefile.am
+++ b/
examples/amok/Makefile.am
@@
-1,3
+1,10
@@
+# Copyright (c) 2004-2007. The SimGrid team. All right reserved.
+
+# This file is part of the SimGrid project. This is free software:
+# You can redistribute and/or modify it under the terms of the
+# GNU LGPL (v2.1) licence.
+
+
INCLUDES= -I$(top_srcdir)/include
AM_CFLAGS=-g
INCLUDES= -I$(top_srcdir)/include
AM_CFLAGS=-g
@@
-15,7
+22,12
@@
LDADD_RL=$(top_builddir)/src/libgras.la
# Bandwidth tests #
###################
EXTRA_DIST+=bandwidth/bandwidth.xml
# Bandwidth tests #
###################
EXTRA_DIST+=bandwidth/bandwidth.xml
-TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg.tesh
+if GRAS_ARCH_32_BITS
+ TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_32.tesh
+else
+ TESTS += bandwidth/bandwidth_rl.tesh bandwidth/bandwidth_sg_64.tesh
+endif
+XFAIL_TESTS+=bandwidth/bandwidth_rl.tesh
noinst_PROGRAMS += \
bandwidth/bandwidth_maestro \
noinst_PROGRAMS += \
bandwidth/bandwidth_maestro \
@@
-33,13
+45,21
@@
bandwidth_bandwidth_sensor_LDADD= $(LDADD_RL)
# Take care of generatated sources
bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwidth_maestro.c : bandwidth/bandwidth.c bandwidth/bandwidth.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
# Take care of generatated sources
bandwidth/_bandwidth_simulator.c bandwidth/_bandwidth_sensor.c bandwidth/_bandwidth_maestro.c : bandwidth/bandwidth.c bandwidth/bandwidth.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
- cd bandwidth;
../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ bandwidth $(srcdir)/..
/bandwidth/bandwidth.xml
+ cd bandwidth;
$(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ bandwidth $(abs_top_srcdir)/examples/amok
/bandwidth/bandwidth.xml
###################
# saturate tests #
###################
EXTRA_DIST+=saturate/saturate.xml
###################
# saturate tests #
###################
EXTRA_DIST+=saturate/saturate.xml
-TESTS += saturate/saturate_rl.tesh saturate/saturate_sg.tesh
+
+if GRAS_ARCH_32_BITS
+ TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_32.tesh
+else
+ TESTS += saturate/saturate_rl.tesh saturate/saturate_sg_64.tesh
+ XFAIL_TESTS += saturate/saturate_sg_64.tesh
+endif
+XFAIL_TESTS += saturate/saturate_rl.tesh
+
noinst_PROGRAMS += \
saturate/saturate_maestro \
noinst_PROGRAMS += \
saturate/saturate_maestro \
@@
-57,11
+77,12
@@
saturate_saturate_sensor_LDADD= $(LDADD_RL)
# Take care of generatated sources
saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_maestro.c : saturate/saturate.c saturate/saturate.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
# Take care of generatated sources
saturate/_saturate_simulator.c saturate/_saturate_sensor.c saturate/_saturate_maestro.c : saturate/saturate.c saturate/saturate.xml $(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@
- cd saturate;
../$(top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ saturate $(srcdir)/..
/saturate/saturate.xml
+ cd saturate;
$(abs_top_builddir)/tools/gras/gras_stub_generator@EXEEXT@ saturate $(abs_top_srcdir)/examples/amok
/saturate/saturate.xml
#########
# Cruft #
#########
#########
# Cruft #
#########
+EXTRA_DIST+=$(TESTS)
include $(top_srcdir)/acmacro/dist-files.mk
include $(top_srcdir)/acmacro/dist-files.mk