Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -365,4 +365,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CC@
 CCAS = @CCAS@
Index: src/benchmark/Makefile.in
===================================================================
--- src/benchmark/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/benchmark/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -135,4 +135,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/driver/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -181,4 +181,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CC@
 CCAS = @CCAS@
Index: src/examples/Makefile.in
===================================================================
--- src/examples/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/examples/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -189,4 +189,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFA_BINDIR@/@CFA_NAME@
 CCAS = @CCAS@
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/libcfa/Makefile.am	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -43,5 +43,5 @@
 #use -no-include-stdhdr to prevent rebuild cycles
 #The built sources must not depend on the installed headers
-CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
+CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
 CC = @CFACC@
 
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/libcfa/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -303,4 +303,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
@@ -321,5 +323,5 @@
 #use -no-include-stdhdr to prevent rebuild cycles
 #The built sources must not depend on the installed headers
-CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
+CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
Index: src/prelude/Makefile.in
===================================================================
--- src/prelude/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/prelude/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -162,4 +162,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/tests/Makefile.am	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -30,18 +30,10 @@
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
-	-XCFA \
-	-t \
-	-B@DRIVER_DIR@ \
 	-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_IN_TREE_FLAGS@
 
 if !BUILD_DEBUG
@@ -80,5 +72,10 @@
 
 % : %.c $(CC)
-	$(COMPILE) $(abspath ${<}) -o ${@}
+	echo "Compiling"
+	$(COMPILE) ${<} -o ${@}
+
+/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
+	echo "Caught"
+
 
 declarationSpecifier: declarationSpecifier.c $(CC)
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/tests/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -181,4 +181,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
@@ -301,12 +303,8 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t -B@DRIVER_DIR@ -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)
+AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
+	-quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
+	@BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
+	$(am__append_3)
 fstream_test_SOURCES = fstream_test.c
 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
@@ -630,5 +628,9 @@
 
 % : %.c $(CC)
-	$(COMPILE) $(abspath ${<}) -o ${@}
+	echo "Compiling"
+	$(COMPILE) ${<} -o ${@}
+
+/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
+	echo "Caught"
 
 declarationSpecifier: declarationSpecifier.c $(CC)
Index: src/tests/preempt_longrun/Makefile.in
===================================================================
--- src/tests/preempt_longrun/Makefile.in	(revision bf5a6477e2497d9c46bfc53cb135fb3d75920f73)
+++ src/tests/preempt_longrun/Makefile.in	(revision 7fb69f6ff47e3cf80a48e7d4a2d60484ab537f48)
@@ -337,4 +337,6 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@