X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1492340ee6cd15b9c583a1e7a387ad082272ae64..7bb9c6c746713ff270064d02ce7a0c614fed896c:/examples/amok/Makefile.am

diff --git a/examples/amok/Makefile.am b/examples/amok/Makefile.am
index 9a2d98bc38..7609ebb688 100644
--- 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
 
@@ -15,7 +22,12 @@ LDADD_RL=$(top_builddir)/src/libgras.la
 # 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   \
@@ -33,13 +45,20 @@ 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@
-	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
-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
+endif
+XFAIL_TESTS += saturate/saturate_rl.tesh 
+
 
 noinst_PROGRAMS += \
   saturate/saturate_maestro   \
@@ -57,11 +76,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@
-	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 #
 #########
+EXTRA_DIST+=$(TESTS)
 include $(top_srcdir)/acmacro/dist-files.mk