Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision 857638d4ae266bd7143f436a63478f8420cd1887)
+++ src/tests/Makefile.am	(revision b8f60026e6aecce251c7ab62227382451436a9da)
@@ -29,19 +29,30 @@
 
 # applies to both programs
-DEBUG_FLAGS =
+AM_CFLAGS = $(if $(test), 2> $(test), ) \
+	-XCFA \
+	-t \
+	-B${abs_top_builddir}/src/driver \
+	-g \
+	-Wall \
+	-Wno-unused-function \
+	-quiet @CFA_FLAGS@ \
+	-I. \
+	-DIN_DIR="${srcdir}/.in/" \
+	-L${abs_top_builddir}/src/libcfa \
+	-I${abs_top_srcdir}/src/libcfa \
+	-I${abs_top_srcdir}/src/libcfa/containers \
+	-I${abs_top_srcdir}/src/libcfa/concurrency \
+	-I${abs_top_srcdir}/src/libcfa/stdhdr
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/"
 if !BUILD_DEBUG
-BUILD_FLAGS += -nodebug
+AM_CFLAGS += -nodebug
 else
 if !BUILD_RELEASE
-BUILD_FLAGS += -debug
+AM_CFLAGS += -debug
 else
-BUILD_FLAGS += ${DEBUG_FLAGS}
+AM_CFLAGS += ${DEBUG_FLAGS}
 endif
 endif
 
-TEST_FLAGS = $(if $(test), 2> $(test), )
-AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 CC = ${abs_top_builddir}/src/driver/cfa
 
@@ -50,8 +61,6 @@
 
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
-avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 all-local :
@@ -70,67 +79,67 @@
 	@+${TEST_PY} --debug=${debug} -Iconcurrent
 
-% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
+% : %.c $(CC)
 	$(COMPILE) $(abspath ${<}) -o ${@}
 
-declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
+declarationSpecifier: declarationSpecifier.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
+gccExtensions : gccExtensions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-extension : extension.c @CFA_BINDIR@/@CFA_NAME@
+extension : extension.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
+attributes : attributes.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-functions: functions.c @CFA_BINDIR@/@CFA_NAME@
+functions: functions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
+KRfunctions : KRfunctions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
+sched-ext-parse : sched-ext-parse.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
+gmp : gmp.c $(CC)
 	$(COMPILE) -lgmp $(abspath ${<}) -o ${@}
 
-completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
+completeTypeError : completeTypeError.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
+typedefRedef-ERR1: typedefRedef.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+alloc-ERROR: alloc.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
+fallthrough-ERROR: fallthrough.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
+nested-types-ERR1: nested-types.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
+nested-types-ERR2: nested-types.c $(CC)
 	$(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
 	$(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
-raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
+warnings/self-assignment: warnings/self-assignment.c $(CC)
 	$(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
-builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
+builtins/sync: builtins/sync.c $(CC)
 	$(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 857638d4ae266bd7143f436a63478f8420cd1887)
+++ src/tests/Makefile.in	(revision b8f60026e6aecce251c7ab62227382451436a9da)
@@ -106,20 +106,13 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_avl_test_OBJECTS = avltree/avl_test-avl_test.$(OBJEXT) \
-	avltree/avl_test-avl0.$(OBJEXT) \
-	avltree/avl_test-avl1.$(OBJEXT) \
-	avltree/avl_test-avl2.$(OBJEXT) \
-	avltree/avl_test-avl3.$(OBJEXT) \
-	avltree/avl_test-avl4.$(OBJEXT) \
-	avltree/avl_test-avl-private.$(OBJEXT)
+am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \
+	avltree/avl0.$(OBJEXT) avltree/avl1.$(OBJEXT) \
+	avltree/avl2.$(OBJEXT) avltree/avl3.$(OBJEXT) \
+	avltree/avl4.$(OBJEXT) avltree/avl-private.$(OBJEXT)
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
-avl_test_LINK = $(CCLD) $(avl_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_fstream_test_OBJECTS = fstream_test-fstream_test.$(OBJEXT)
+am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
 fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
 fstream_test_LDADD = $(LDADD)
-fstream_test_LINK = $(CCLD) $(fstream_test_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -138,8 +131,4 @@
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -309,14 +298,15 @@
 
 # applies to both programs
-DEBUG_FLAGS = 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
-	-DIN_DIR="${srcdir}/.in/" $(am__append_1) $(am__append_2) \
-	$(am__append_3)
-TEST_FLAGS = $(if $(test), 2> $(test), )
-AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
+AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
+	-B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
+	-quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
+	-L${abs_top_builddir}/src/libcfa \
+	-I${abs_top_srcdir}/src/libcfa \
+	-I${abs_top_srcdir}/src/libcfa/containers \
+	-I${abs_top_srcdir}/src/libcfa/concurrency \
+	-I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
+	$(am__append_2) $(am__append_3)
 fstream_test_SOURCES = fstream_test.c
-fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
-avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 all: all-am
 
@@ -360,26 +350,26 @@
 	@$(MKDIR_P) avltree/$(DEPDIR)
 	@: > avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl_test.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl0.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl0.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl1.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl1.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl2.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl2.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl3.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl3.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl4.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl4.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
-avltree/avl_test-avl-private.$(OBJEXT): avltree/$(am__dirstamp) \
+avltree/avl-private.$(OBJEXT): avltree/$(am__dirstamp) \
 	avltree/$(DEPDIR)/$(am__dirstamp)
 
 avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) 
 	@rm -f avl_test$(EXEEXT)
-	$(AM_V_CCLD)$(avl_test_LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS)
 
 fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES) 
 	@rm -f fstream_test$(EXEEXT)
-	$(AM_V_CCLD)$(fstream_test_LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -390,12 +380,12 @@
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test-fstream_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl-private.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl0.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test.Po@am__quote@
 
 .c.o:
@@ -414,116 +404,4 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-avltree/avl_test-avl_test.o: avltree/avl_test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c
-
-avltree/avl_test-avl_test.obj: avltree/avl_test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi`
-
-avltree/avl_test-avl0.o: avltree/avl0.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c
-
-avltree/avl_test-avl0.obj: avltree/avl0.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi`
-
-avltree/avl_test-avl1.o: avltree/avl1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c
-
-avltree/avl_test-avl1.obj: avltree/avl1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi`
-
-avltree/avl_test-avl2.o: avltree/avl2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c
-
-avltree/avl_test-avl2.obj: avltree/avl2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi`
-
-avltree/avl_test-avl3.o: avltree/avl3.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c
-
-avltree/avl_test-avl3.obj: avltree/avl3.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi`
-
-avltree/avl_test-avl4.o: avltree/avl4.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c
-
-avltree/avl_test-avl4.obj: avltree/avl4.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi`
-
-avltree/avl_test-avl-private.o: avltree/avl-private.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c
-
-avltree/avl_test-avl-private.obj: avltree/avl-private.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi`
-
-fstream_test-fstream_test.o: fstream_test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.o -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c
-
-fstream_test-fstream_test.obj: fstream_test.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.obj -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi`
 
 ID: $(am__tagged_files)
@@ -749,68 +627,68 @@
 	@+${TEST_PY} --debug=${debug} -Iconcurrent
 
-% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
+% : %.c $(CC)
 	$(COMPILE) $(abspath ${<}) -o ${@}
 
-declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
+declarationSpecifier: declarationSpecifier.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
+gccExtensions : gccExtensions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-extension : extension.c @CFA_BINDIR@/@CFA_NAME@
+extension : extension.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
+attributes : attributes.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-functions: functions.c @CFA_BINDIR@/@CFA_NAME@
+functions: functions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
+KRfunctions : KRfunctions.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
+sched-ext-parse : sched-ext-parse.c $(CC)
 	$(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
+gmp : gmp.c $(CC)
 	$(COMPILE) -lgmp $(abspath ${<}) -o ${@}
 
-completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
+completeTypeError : completeTypeError.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+typedefRedef-ERR1: typedefRedef.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+alloc-ERROR: alloc.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+fallthrough-ERROR: fallthrough.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR1: nested-types.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+nested-types-ERR2: nested-types.c $(CC)
 	$(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
 	$(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
-raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
-
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
 	$(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
+warnings/self-assignment: warnings/self-assignment.c $(CC)
 	$(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
-builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
+builtins/sync: builtins/sync.c $(CC)
 	$(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only