Fix and simplify the generation of the gspn-ssp Makefile

ChangeLog

@@ -1,3 +1,10 @@
+2008-08-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* bench/gspn-ssp/tools/modelgen-create: Remove and fold into ...
+	* bench/gspn-ssp/tools/bench-create: ... this.
+	* bench/gspn-ssp/Makefile.am: Update.
+	* bench/gspn-ssp/bench.mk: Regen.
+
 2008-08-29  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* bench/gspn-ssp/tools/defs.in (TMPDIR): New variable.

bench/gspn-ssp/Makefile.am

@@ -35,11 +35,11 @@ run_bench = tools/runbench
 
 dist_noinst_SCRIPTS = \
   tools/bench-create \
-  tools/modelgen-create \
   tools/trans2prop.pl \
   tools/sum \
   $(run_bench)
 
+$(RESULTS): defs
 nodist_check_DATA = $(RESULTS)
 
 clean-local:

bench/gspn-ssp/tools/bench-create

@@ -1,10 +1,14 @@
 #!/bin/sh
 
-if test ! -d models; then
+if test ! -d templates; then
-  echo "Error: this script should be run from the parent of the models/ directory." 2>&1
+  echo "Error: this script should be run from the parent of the templates/ directory." 2>&1
   exit 1
 fi
 
+rm -f modelgen.mk
+templates/gen > modelgen.mk
+chmod -w modelgen.mk
+
 out=bench.mk
 rm -f $out
 exec >$out
@@ -16,8 +20,7 @@ F=50
 
 allres=
 
-cd models
+for i in `grep /stamp: modelgen.mk | sed 's,^models/\(.*\)/stamp:.*,\1,'`; do
-for i in *; do
 
   Ffile=models/$i/formulae
   echo "############################## $i ##############################"
@@ -27,7 +30,6 @@ for i in *; do
   echo "	\$(top_builddir)/src/ltltest/randltl -F $F -u -s 0 -f 10 -r 7 \`cat models/$i/$i.ap\` > \$@"
   echo
 
-  cd $i
   for ltl2tgba in -f; do
     case $i in
       *.rg) checks=e2;;
@@ -53,10 +55,8 @@ for i in *; do
       echo
     done
   done
-  cd ..
 done
 
 echo "RESULTS =$allres"
 
-cd ..
 chmod -w $out

bench/gspn-ssp/tools/modelgen-create

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if test ! -d template; then
-  echo "Error: this script should be run from the parent of the template/ directory." 2>&1
-  exit 1
-fi
-
-rm -f modelgen.mk
-templates/gen > modelgen.mk
-chmod -w modelgen.mk