Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -296,5 +296,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/configure	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -707,5 +707,4 @@
 CONFIG_CFLAGS
 ARCH_FLAGS
-PRELUDEFLAG
 CFADIR_HASH
 LOCAL_CC1
@@ -2960,5 +2959,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	PRELUDEFLAG='-in-tree'
 	echo "no"
 else
@@ -2968,5 +2966,4 @@
 	CFADIR_HASH=$($tools/distcc_hash $config)
 	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
-	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
@@ -2982,5 +2979,4 @@
   ENABLE_DISTCC_FALSE=
 fi
-
 
 
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/configure.ac	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -34,5 +34,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	PRELUDEFLAG='-in-tree'
 	echo "no"
 else
@@ -42,5 +41,4 @@
 	CFADIR_HASH=$($tools/distcc_hash $config)
 	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
-	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
@@ -57,5 +55,4 @@
 AC_SUBST(CFADIR_HASH)
 AC_SUBST(CFA_VERSION)
-AC_SUBST(PRELUDEFLAG)
 
 #==============================================================================
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/prelude/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -239,5 +239,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/src/Makefile.am	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -32,5 +32,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -96,9 +96,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 31d8f4d90bed64a8149506909017537476832bb6)
+++ libcfa/src/Makefile.in	(revision 158b026fb8f759ed1b6cebe96e8a07ccb25235cb)
@@ -349,5 +349,4 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -445,5 +444,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -cfalib @PRELUDEFLAG@ -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
@@ -954,9 +953,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------