Index: src/main.cc
===================================================================
--- src/main.cc	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/main.cc	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
@@ -11,6 +11,6 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 28 21:56:47 2017
-// Update Count     : 440
+// Last Modified On : Thu Jun 29 12:46:50 2017
+// Update Count     : 441
 //
 
@@ -481,5 +481,9 @@
 			break;
 		  case '?':
-			assertf( false, "Unknown option: '%c'\n", (char)optopt );
+			if ( optopt ) {								// short option ?
+				assertf( false, "Unknown option: -%c\n", (char)optopt );
+			} else {
+				assertf( false, "Unknown option: %s\n", argv[optind - 1] );
+			} // if
 		  default:
 			abort();
Index: src/prelude/Makefile.am
===================================================================
--- src/prelude/Makefile.am	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/prelude/Makefile.am	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
@@ -23,4 +23,10 @@
 noinst_DATA = ../libcfa/libcfa-prelude.c
 
+$(DEPDIR) :
+	mkdir $(DEPDIR)
+
+$(DEPDIR)/builtins.Po : $(DEPDIR)
+	touch ${@}
+
 # create extra forward types/declarations to reduce inclusion of library files
 extras.cf : extras.regx extras.c
@@ -40,5 +46,8 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c
-	${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
+	${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+	${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+
+include $(DEPDIR)/builtins.Po
 
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
@@ -48,3 +57,6 @@
 	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
+maintainer-clean-local :
+	rm -rf $(DEPDIR)
+
 MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/prelude/Makefile.in	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
@@ -390,5 +390,6 @@
 maintainer-clean: maintainer-clean-am
 	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+	maintainer-clean-local
 
 mostlyclean: mostlyclean-am
@@ -416,7 +417,14 @@
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-cfalibDATA
-
+	maintainer-clean-generic maintainer-clean-local mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-cfalibDATA
+
+
+$(DEPDIR) :
+	mkdir $(DEPDIR)
+
+$(DEPDIR)/builtins.Po : $(DEPDIR)
+	touch ${@}
 
 # create extra forward types/declarations to reduce inclusion of library files
@@ -437,5 +445,8 @@
 # create forward declarations for cfa builtins
 builtins.cf : builtins.c
-	${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@}
+	${AM_V_GEN}@BACKEND_CC@ -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
+	${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
+
+include $(DEPDIR)/builtins.Po
 
 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
@@ -444,4 +455,7 @@
 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
 	${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+
+maintainer-clean-local :
+	rm -rf $(DEPDIR)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: src/tests/preempt_longrun/Makefile.am
===================================================================
--- src/tests/preempt_longrun/Makefile.am	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/tests/preempt_longrun/Makefile.am	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
@@ -16,11 +16,10 @@
 
 repeats=10
-max_time=10
-N=10ul
+max_time=30
 preempt=10_000ul
 
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
Index: src/tests/preempt_longrun/Makefile.in
===================================================================
--- src/tests/preempt_longrun/Makefile.in	(revision 288eede1f5af2a195505be61ef509aea27711ce8)
+++ src/tests/preempt_longrun/Makefile.in	(revision fe5c01dc12bdff1880c53a48f4b74eb6262c2008)
@@ -178,9 +178,8 @@
 top_srcdir = @top_srcdir@
 repeats = 10
-max_time = 10
-N = 10ul
+max_time = 30
 preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = barge block create disjoint processor stack wait yield
 all: all-am