Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
+++ src/tests/Makefile.am	(revision 8f8af30621e5ab84b747ccebd5eb0485d0310dad)
@@ -57,34 +57,38 @@
 	@+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
 
-.dummy : .dummy.c
+.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
 
-dtor-early-exit-ERR1: dtor-early-exit.c
+
+% : %.c @CFA_BINDIR@/@CFA_NAME@
+	${CC} ${CFLAGS} ${<} -o ${@}
+
+dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-dtor-early-exit-ERR2: dtor-early-exit.c
+dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
-declarationSpecifier: declarationSpecifier.c
+declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gccExtensions : gccExtensions.c
+gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-extension : extension.c
+extension : extension.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-attributes : attributes.c
+attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-KRfunctions : KRfunctions.c
+KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gmp : gmp.c
+gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c
+memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-completeTypeError : completeTypeError.c
+completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision ec95d1177c41ea894d346d43b00af99c7f01bb8b)
+++ src/tests/Makefile.in	(revision 8f8af30621e5ab84b747ccebd5eb0485d0310dad)
@@ -661,35 +661,38 @@
 	@+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
 
-.dummy : .dummy.c
+.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
 
-dtor-early-exit-ERR1: dtor-early-exit.c
+% : %.c @CFA_BINDIR@/@CFA_NAME@
+	${CC} ${CFLAGS} ${<} -o ${@}
+
+dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-dtor-early-exit-ERR2: dtor-early-exit.c
+dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
-declarationSpecifier: declarationSpecifier.c
+declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gccExtensions : gccExtensions.c
+gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-extension : extension.c
+extension : extension.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-attributes : attributes.c
+attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-KRfunctions : KRfunctions.c
+KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gmp : gmp.c
+gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c
+memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-completeTypeError : completeTypeError.c
+completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${CFLAGS} -DERR1 ${<} -o ${@}