Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision 8633485b53ccf10786bcb6ce270cac069166b0d7)
+++ benchmark/Makefile.am	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
@@ -72,8 +72,7 @@
 	echo "int main() { return 0; }" > ${@}
 
-#.SILENT:		# do not print recipe
-.ONESHELL:		# use one shell to execute recipe
+.SILENT:		# do not print recipe
 .NOTPARALLEL:
-.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
+.PHONY: jenkins cleancsv
 
 ## =========================================================================================================
@@ -142,11 +141,12 @@
 FIX_NEW_LINES = cat $@ | tr "\n" "\t" | sed -r 's/\t,/,/' | tr "\t" "\n" > $@
 
-jenkins$(EXEEXT):
+cleancsv:
+	rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
+
+jenkins$(EXEEXT): cleancsv
 @DOifskipcompile@
 	+make compile.csv
 	-+make compile.diff.csv
 @DOendif@
-	+make basic.csv
-	-+make basic.diff.csv
 	+make ctxswitch.csv
 	-+make ctxswitch.diff.csv
@@ -159,6 +159,4 @@
 	-cat compile.diff.csv
 @DOendif@
-	cat basic.csv
-	-cat basic.diff.csv
 	cat ctxswitch.csv
 	-cat ctxswitch.diff.csv
@@ -169,4 +167,5 @@
 
 compile.csv:
+	echo "building $@"
 	echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
 	+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
@@ -180,12 +179,14 @@
 	$(srcdir)/fixcsv.sh $@
 
-basic.csv:
-	echo "generator,coroutine,thread" > $@
-	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
-	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
-	+make basic-cfa_thread.runquiet >> $@
-	$(srcdir)/fixcsv.sh $@
+# basic.csv:
+# 	echo "$@"
+# 	echo "generator,coroutine,thread" > $@
+# 	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
+# 	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
+# 	+make basic-cfa_thread.runquiet >> $@
+# 	$(srcdir)/fixcsv.sh $@
 
 ctxswitch.csv:
+	echo "building $@"
 	echo "generator,coroutine,thread" > $@
 	+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
@@ -195,4 +196,5 @@
 
 mutex.csv:
+	echo "building $@"
 	echo "1-monitor,2-monitor" > $@
 	+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
@@ -201,4 +203,5 @@
 
 schedint.csv:
+	echo "building $@"
 	echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
 	+make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 8633485b53ccf10786bcb6ce270cac069166b0d7)
+++ benchmark/Makefile.in	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
@@ -784,8 +784,7 @@
 	echo "int main() { return 0; }" > ${@}
 
-#.SILENT:		# do not print recipe
-.ONESHELL:		# use one shell to execute recipe
+.SILENT:		# do not print recipe
 .NOTPARALLEL:
-.PHONY: compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
+.PHONY: jenkins cleancsv
 
 all : basic$(EXEEXT) ctxswitch$(EXEEXT) mutex$(EXEEXT) schedint$(EXEEXT) schedext$(EXEEXT) creation$(EXEEXT)
@@ -817,11 +816,12 @@
 	+make -C ${abs_top_builddir}/tools repeat
 
-jenkins$(EXEEXT):
+cleancsv:
+	rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
+
+jenkins$(EXEEXT): cleancsv
 @DOifskipcompile@
 	+make compile.csv
 	-+make compile.diff.csv
 @DOendif@
-	+make basic.csv
-	-+make basic.diff.csv
 	+make ctxswitch.csv
 	-+make ctxswitch.diff.csv
@@ -834,6 +834,4 @@
 	-cat compile.diff.csv
 @DOendif@
-	cat basic.csv
-	-cat basic.diff.csv
 	cat ctxswitch.csv
 	-cat ctxswitch.diff.csv
@@ -844,4 +842,5 @@
 
 compile.csv:
+	echo "building $@"
 	echo "array,attributes,empty,expression,io,monitor,operators,typeof" > $@
 	+make TIME_FORMAT='%e,' PRINT_FORMAT='' compile-array.make >> $@
@@ -855,12 +854,14 @@
 	$(srcdir)/fixcsv.sh $@
 
-basic.csv:
-	echo "generator,coroutine,thread" > $@
-	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
-	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
-	+make basic-cfa_thread.runquiet >> $@
-	$(srcdir)/fixcsv.sh $@
+# basic.csv:
+# 	echo "$@"
+# 	echo "generator,coroutine,thread" > $@
+# 	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
+# 	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
+# 	+make basic-cfa_thread.runquiet >> $@
+# 	$(srcdir)/fixcsv.sh $@
 
 ctxswitch.csv:
+	echo "building $@"
 	echo "generator,coroutine,thread" > $@
 	+make ctxswitch-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
@@ -870,4 +871,5 @@
 
 mutex.csv:
+	echo "building $@"
 	echo "1-monitor,2-monitor" > $@
 	+make mutex-cfa1.runquiet >> $@ && echo -n ',' >> $@
@@ -876,4 +878,5 @@
 
 schedint.csv:
+	echo "building $@"
 	echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
 	+make schedint-cfa1.runquiet >> $@ && echo -n ',' >> $@
Index: benchmark/baselines/x64/schedint.csv
===================================================================
--- benchmark/baselines/x64/schedint.csv	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
+++ benchmark/baselines/x64/schedint.csv	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
@@ -0,0 +1,2 @@
+schedext-2,schedint-1,schedint-2,schedext-1
+393.69606249999987,325.99158333333327,409.01025000000004,319.90975000000003
Index: benchmark/baselines/x64/signal.csv
===================================================================
--- benchmark/baselines/x64/signal.csv	(revision 8633485b53ccf10786bcb6ce270cac069166b0d7)
+++ 	(revision )
@@ -1,2 +1,0 @@
-waitfor-2,signal-1,signal-2,waitfor-1
-393.69606249999987,325.99158333333327,409.01025000000004,319.90975000000003
Index: benchmark/baselines/x86/schedint.csv
===================================================================
--- benchmark/baselines/x86/schedint.csv	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
+++ benchmark/baselines/x86/schedint.csv	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
@@ -0,0 +1,2 @@
+schedint-2,schedext-1,schedext-2,schedint-1
+532.5297959183672,413.3084897959184,506.7579591836735,423.78826530612247
Index: benchmark/baselines/x86/signal.csv
===================================================================
--- benchmark/baselines/x86/signal.csv	(revision 8633485b53ccf10786bcb6ce270cac069166b0d7)
+++ 	(revision )
@@ -1,2 +1,0 @@
-signal-2,waitfor-1,waitfor-2,signal-1
-532.5297959183672,413.3084897959184,506.7579591836735,423.78826530612247