Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 50697b0c1a5a7ab4634decc93217223196c5ccfe)
+++ 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 50697b0c1a5a7ab4634decc93217223196c5ccfe)
+++ 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@
