Index: configure
===================================================================
--- configure	(revision 944a90f3e4e922c52dac54751e8c9b2705a97fb0)
+++ configure	(revision ad486c5b7f3e573aece74c5ee7d3010f39f1fc7f)
@@ -3392,5 +3392,5 @@
 LIBCFA_BUILD='$(top_builddir)/src/libcfa'
 BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
-BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
+BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
 
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 944a90f3e4e922c52dac54751e8c9b2705a97fb0)
+++ configure.ac	(revision ad486c5b7f3e573aece74c5ee7d3010f39f1fc7f)
@@ -183,5 +183,5 @@
 LIBCFA_BUILD='$(top_builddir)/src/libcfa'
 BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
-BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
+BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
 AC_SUBST(BUILD_IN_TREE_FLAGS_NOLIB)
 AC_SUBST(BUILD_IN_TREE_FLAGS)
Index: src/cfa.make
===================================================================
--- src/cfa.make	(revision ad486c5b7f3e573aece74c5ee7d3010f39f1fc7f)
+++ src/cfa.make	(revision ad486c5b7f3e573aece74c5ee7d3010f39f1fc7f)
@@ -0,0 +1,11 @@
+CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+AM_V_CFA = $(am__v_CFA_@AM_V@)
+am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
+am__v_CFA_0 = @echo "  CFA     " $@;
+am__v_CFA_1 =
+
+.cfa.c:
+	$(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+	$(CFACOMPILE) -CFA -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+	$(am__mv) $$depbase.Tpo $$depbase.Po