Index: libcfa/Makefile.in
===================================================================
--- libcfa/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/Makefile.in	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -276,5 +276,4 @@
 LN_S = @LN_S@
 LOCAL_CFACC = @LOCAL_CFACC@
-LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/configure	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -709,5 +709,4 @@
 PRELUDEFLAG
 CFADIR_HASH
-LOCAL_CFACPP
 LOCAL_CFACC
 CFACPP
@@ -2960,5 +2959,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	CFACPP=${DRIVER_DIR}cfa-cpp
 	PRELUDEFLAG='-in-tree'
 	echo "no"
@@ -2967,11 +2965,10 @@
 	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"
+	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
 	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
+CFACPP=${DRIVER_DIR}cfa-cpp
 LOCAL_CFACC=${DRIVER_DIR}cfa
-LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
 
  if test x$enable_distcc = xyes; then
@@ -2982,5 +2979,4 @@
   ENABLE_DISTCC_FALSE=
 fi
-
 
 
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/configure.ac	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -34,5 +34,4 @@
 if test x$enable_distcc = xno; then
 	CFACC=${DRIVER_DIR}cfa
-	CFACPP=${DRIVER_DIR}cfa-cpp
 	PRELUDEFLAG='-in-tree'
 	echo "no"
@@ -41,11 +40,10 @@
 	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"
+	CFACC="distcc ~/.cfadistcc/${CFADIR_HASH}/cfa"
 	PRELUDEFLAG='-dist-tree'
 	echo "yes (hash=${CFADIR_HASH})"
 fi
+CFACPP=${DRIVER_DIR}cfa-cpp
 LOCAL_CFACC=${DRIVER_DIR}cfa
-LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
 
 AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
@@ -54,5 +52,4 @@
 AC_SUBST(CFACPP)
 AC_SUBST(LOCAL_CFACC)
-AC_SUBST(LOCAL_CFACPP)
 AC_SUBST(CFADIR_HASH)
 AC_SUBST(CFA_VERSION)
Index: libcfa/prelude/Makefile.am
===================================================================
--- libcfa/prelude/Makefile.am	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/prelude/Makefile.am	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -60,6 +60,6 @@
 include $(DEPDIR)/builtins.Po
 
-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
+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
 
 maintainer-clean-local :
@@ -70,5 +70,5 @@
 
 if ENABLE_DISTCC
-distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
+distribution: @LOCAL_CFACC@ @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" > ${@}
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/prelude/Makefile.in	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -219,5 +219,4 @@
 LN_S = @LN_S@
 LOCAL_CFACC = @LOCAL_CFACC@
-LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -565,11 +564,11 @@
 include $(DEPDIR)/builtins.Po
 
-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
+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
 
 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@distribution: @LOCAL_CFACC@ @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" > ${@}
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/src/Makefile.am	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -30,5 +30,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet @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) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
+$(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
 
 thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
-$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
+$(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
 
 
@@ -84,8 +84,8 @@
 
 
-prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
+prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @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@
+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 ${@}
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision bbfd0e08bed66db0dd7f0435baca11031a2d4e96)
+++ libcfa/src/Makefile.in	(revision 14347ac3300cc16a43a64e129a39209ae2dd2666)
@@ -329,5 +329,4 @@
 LN_S = @LN_S@
 LOCAL_CFACC = @LOCAL_CFACC@
-LOCAL_CFACPP = @LOCAL_CFACPP@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
@@ -444,5 +443,5 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
+AM_CFAFLAGS = -quiet @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@
@@ -940,6 +939,6 @@
 	$(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 	$(am__mv) $$depbase.Tpo $$depbase.Plo
-$(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
-$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
+$(libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
+$(thread_libobjs) : @LOCAL_CFACC@ @CFACPP@ prelude.cfa
 
 -include $(libdeps)
@@ -947,8 +946,8 @@
 -include $(thread_libdeps)
 
-prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
+prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @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@
+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 ${@}