Index: configure
===================================================================
--- configure	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ configure	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -663,5 +663,4 @@
 ac_ct_DUMPBIN
 DUMPBIN
-LD
 FGREP
 EGREP
@@ -701,5 +700,4 @@
 LDFLAGS
 CXXFLAGS
-CXX
 CFA_FLAGS
 LIBCFA_TARGET_MAKEFILES
@@ -723,4 +721,8 @@
 CFA_INCDIR
 CFA_PREFIX
+LD
+CXX
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 DOendif
 DOifskipcompile
@@ -797,4 +799,5 @@
 enable_silent_rules
 with_cfa_name
+enable_distcc
 with_target_hosts
 enable_gprofiler
@@ -1459,4 +1462,5 @@
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-distcc     whether or not to enable distributed compilation
   --enable-gprofiler     whether or not to enable gprofiler tools (if available)
   --enable-demangler     whether or not to build the demangler (executable and library)
@@ -3180,4 +3184,33 @@
 
 DOendif='endif'
+
+
+
+#==============================================================================
+# distcc support
+
+# Check whether --enable-distcc was given.
+if test "${enable_distcc+set}" = set; then :
+  enableval=$enable_distcc; enable_distcc=$enableval
+else
+  enable_distcc=no
+fi
+
+
+ if test x$enable_distcc = xyes; then
+  ENABLE_DISTCC_TRUE=
+  ENABLE_DISTCC_FALSE='#'
+else
+  ENABLE_DISTCC_TRUE='#'
+  ENABLE_DISTCC_FALSE=
+fi
+
+
+if test x$enable_distcc = xyes; then
+	CXX="distcc ${CXX}"
+	LD="distcc ${LD} -lstdc++"
+	echo "Enabling distributed builds"
+fi
+
 
 
@@ -17017,4 +17050,8 @@
 fi
 
+if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
Index: configure.ac
===================================================================
--- configure.ac	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ configure.ac	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -56,4 +56,22 @@
 AC_SUBST([DOendif])
 AM_SUBST_NOTMAKE([DOendif])
+
+#==============================================================================
+# distcc support
+
+AC_ARG_ENABLE(distcc,
+	[  --enable-distcc     whether or not to enable distributed compilation],
+	enable_distcc=$enableval, enable_distcc=no)
+
+AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
+
+if test x$enable_distcc = xyes; then
+	CXX="distcc ${CXX}"
+	LD="distcc ${LD} -lstdc++"
+	echo "Enabling distributed builds"
+fi
+
+AC_SUBST(CXX)
+AC_SUBST(LD)
 
 #==============================================================================
Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ driver/cfa.cc	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -84,4 +84,8 @@
         return false;
 } //dirExists
+
+static inline string dir(const string & path) {
+	return path.substr(0, path.find_last_of('/'));
+}
 
 
@@ -119,4 +123,5 @@
 	bool m64 = false;                                    // -m64 flag
 	bool intree = false;
+	bool disttree = false;
 
 	const char *args[argc + 100];						// cfa command line values, plus some space for additional flags
@@ -178,4 +183,6 @@
 			} else if ( arg == "-in-tree" ) {
 				intree = true;
+			} else if ( arg == "-dist-tree" ) {
+				disttree = true;
 			} else if ( arg == "-compiler" ) {
 				// use the user specified compiler
@@ -372,17 +379,29 @@
 	string libdir = libbase + arch + "-" + config;
 
-	if ( ! nolib && ! dirExists( libdir ) ) {
-		cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
-		cerr << "Was looking for " << libdir << endl;
-		libdir = libbase + arch + "-" + "nolib";
-	} // if
-
-	if ( ! dirExists( libdir ) ) {
-		cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
-		cerr << "Was looking for " << libdir << endl;
-		exit( EXIT_FAILURE );
-	} // if
-
-	args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str();
+	if (!disttree) {
+		if ( ! nolib && ! dirExists( libdir ) ) {
+			cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
+			cerr << "Was looking for " << libdir << endl;
+			for(int i = 1; i < argc; i++) {
+				cerr << argv[i] << " ";
+			}
+			cerr << endl;
+			libdir = libbase + arch + "-" + "nolib";
+		} // if
+
+		if ( ! dirExists( libdir ) ) {
+			cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
+			cerr << "Was looking for " << libdir << endl;
+			exit( EXIT_FAILURE );
+		} // if
+	} // if
+
+	if(disttree) {
+		args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + dir(argv[0])) ).c_str();
+	} else if(intree) {
+		args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + "/prelude") ).c_str();
+	} else {
+		args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir) ).c_str();
+	}
 	nargs += 1;
 
@@ -473,5 +492,12 @@
 
 	if ( Bprefix.length() == 0 ) {
-		Bprefix = ! intree ? installlibdir : srcdriverdir;
+		if(disttree) {
+			Bprefix = dir(argv[0]);
+		} else if(intree) {
+			Bprefix = srcdriverdir;
+		} else {
+			Bprefix = installlibdir;
+		}
+
 		if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
 		args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -231,4 +231,5 @@
 CFACC = @CFACC@
 CFACPP = @CFACPP@
+CFADIR_HASH = @CFADIR_HASH@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -274,4 +275,6 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CFACC = @LOCAL_CFACC@
+LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -293,4 +296,5 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/configure	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -707,6 +707,12 @@
 CONFIG_CFLAGS
 ARCH_FLAGS
+PRELUDEFLAG
+CFADIR_HASH
+LOCAL_CFACPP
+LOCAL_CFACC
 CFACPP
 CFACC
+ENABLE_DISTCC_FALSE
+ENABLE_DISTCC_TRUE
 CFA_VERSION
 DRIVER_DIR
@@ -783,4 +789,5 @@
 enable_option_checking
 enable_silent_rules
+enable_distcc
 with_cfa_name
 enable_shared
@@ -1445,4 +1452,5 @@
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-distcc     whether or not to enable distributed compilation
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -2941,6 +2949,43 @@
 
 
-CFACC=${DRIVER_DIR}cfa
-CFACPP=${DRIVER_DIR}cfa-cpp
+# Check whether --enable-distcc was given.
+if test "${enable_distcc+set}" = set; then :
+  enableval=$enable_distcc; enable_distcc=$enableval
+else
+  enable_distcc=no
+fi
+
+
+echo -n "checking for distributated build... "
+if test x$enable_distcc = xno; then
+	CFACC=${DRIVER_DIR}cfa
+	CFACPP=${DRIVER_DIR}cfa-cpp
+	PRELUDEFLAG='-in-tree'
+	echo "no"
+else
+	path=$(readlink -f .)
+	CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
+	CFADIR_HASH="${CFADIR_HASH: -10}"
+	CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
+	CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
+	PRELUDEFLAG='-dist-tree'
+	echo "yes (hash=${CFADIR_HASH})"
+fi
+LOCAL_CFACC=${DRIVER_DIR}cfa
+LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
+
+ if test x$enable_distcc = xyes; then
+  ENABLE_DISTCC_TRUE=
+  ENABLE_DISTCC_FALSE='#'
+else
+  ENABLE_DISTCC_TRUE='#'
+  ENABLE_DISTCC_FALSE=
+fi
+
+
+
+
+
+
 
 
@@ -16982,4 +17027,8 @@
 fi
 
+if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
   as_fn_error $? "conditional \"BUILDLIB\" was never defined.
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/configure.ac	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -27,9 +27,35 @@
 AC_ARG_VAR(CFA_VERSION, [The long version of cfa])
 
-CFACC=${DRIVER_DIR}cfa
-CFACPP=${DRIVER_DIR}cfa-cpp
+AC_ARG_ENABLE(distcc,
+	[  --enable-distcc     whether or not to enable distributed compilation],
+	enable_distcc=$enableval, enable_distcc=no)
+
+echo -n "checking for distributated build... "
+if test x$enable_distcc = xno; then
+	CFACC=${DRIVER_DIR}cfa
+	CFACPP=${DRIVER_DIR}cfa-cpp
+	PRELUDEFLAG='-in-tree'
+	echo "no"
+else
+	path=$(readlink -f .)
+	CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
+	CFADIR_HASH="${CFADIR_HASH: -10}"
+	CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
+	CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
+	PRELUDEFLAG='-dist-tree'
+	echo "yes (hash=${CFADIR_HASH})"
+fi
+LOCAL_CFACC=${DRIVER_DIR}cfa
+LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
+
+AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
+
 AC_SUBST(CFACC)
 AC_SUBST(CFACPP)
+AC_SUBST(LOCAL_CFACC)
+AC_SUBST(LOCAL_CFACPP)
+AC_SUBST(CFADIR_HASH)
 AC_SUBST(CFA_VERSION)
+AC_SUBST(PRELUDEFLAG)
 
 #==============================================================================
Index: libcfa/prelude/Makefile.am
===================================================================
--- libcfa/prelude/Makefile.am	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/prelude/Makefile.am	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -23,5 +23,5 @@
 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
 
-CC = @CFACC@
+CC = @LOCAL_CFACC@
 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CFAFLAGS = @CONFIG_CFAFLAGS@
@@ -54,5 +54,5 @@
 
 # create forward declarations for cfa builtins
-builtins.cf : builtins.c ${CC}
+builtins.cf : builtins.c @LOCAL_CFACC@
 	${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
 	${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
@@ -60,6 +60,6 @@
 include $(DEPDIR)/builtins.Po
 
-bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
-	${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
+	${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
@@ -68,2 +68,10 @@
 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+
+if ENABLE_DISTCC
+distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+	${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
+	echo "Dummy file to track distribution to remote hosts" > ${@}
+
+all: all-am distribution
+endif ENABLE_DISTCC
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/prelude/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -167,5 +167,5 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CC = @CFACC@
+CC = @LOCAL_CFACC@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -174,4 +174,5 @@
 CFACC = @CFACC@
 CFACPP = @CFACPP@
+CFADIR_HASH = @CFADIR_HASH@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -217,4 +218,6 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CFACC = @LOCAL_CFACC@
+LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -236,4 +239,5 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -555,5 +559,5 @@
 
 # create forward declarations for cfa builtins
-builtins.cf : builtins.c ${CC}
+builtins.cf : builtins.c @LOCAL_CFACC@
 	${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
 	${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
@@ -561,9 +565,15 @@
 include $(DEPDIR)/builtins.Po
 
-bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
-	${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
+	${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 maintainer-clean-local :
 	rm -rf $(DEPDIR)
+
+@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+@ENABLE_DISTCC_TRUE@	${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
+@ENABLE_DISTCC_TRUE@	echo "Dummy file to track distribution to remote hosts" > ${@}
+
+@ENABLE_DISTCC_TRUE@all: all-am distribution
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/src/Makefile.am	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -30,5 +30,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @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@
@@ -62,8 +62,8 @@
 # add dependency of cfa files
 libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
-$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+$(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
 
 thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
-$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
 
 
@@ -84,10 +84,10 @@
 
 
-prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
+prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
+	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
 
-prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
 
 
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 7e0017f54e83434f31dd9abb83c27b097125746c)
+++ libcfa/src/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
@@ -284,4 +284,5 @@
 CFACC = @CFACC@
 CFACPP = @CFACPP@
+CFADIR_HASH = @CFADIR_HASH@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -327,4 +328,6 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOCAL_CFACC = @LOCAL_CFACC@
+LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -346,4 +349,5 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PRELUDEFLAG = @PRELUDEFLAG@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -440,5 +444,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @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@
@@ -936,6 +940,6 @@
 	$(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 	$(am__mv) $$depbase.Tpo $$depbase.Plo
-$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
-$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+$(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
+$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
 
 -include $(libdeps)
@@ -943,10 +947,10 @@
 -include $(thread_libdeps)
 
-prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
-
-prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
+prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
+	${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
+
+prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------