build system: additional Makefile fragments

better handling of dependencies for highly parallel make git-svn-id: svn://tug.org/texlive/trunk@31127 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2013-07-07 14:29:53 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2013-07-07 14:29:53 +0000
commit: 0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch)
tree: e2f7056cb53c58c8ef5779450ac468091b2bd86d
parent: 3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (diff)
80 files changed, 2938 insertions, 941 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index c999f685d8e..b9cf8532854 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,7 +1,11 @@
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* am/*.am: New Makefile fragments from libs/am/ and tekk/am/.
+	* am/*.am: Moved Makefile fragments from libs/am/ and tekk/am/.
 	* am/rebuild.am: New Makefile fragment to rebuild a library.
+	* am/reconfig.am: New Makefile fragment to reconfigure.
+	* am/recurse.am: New Makefile fragment to recurse into subdirs.
+
+	* Makefile.am, configure.ac: Use am/recurse.am.
 
 2013-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index dcec116f3af..e328bf1dab6 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -30,58 +30,20 @@ EXTRA_DIST = \
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-CONFIG_AUX = subsubdir-conf.cmd
-
-SUBDIRS = . $(TEXLIBS) libs utils texk
-DIST_SUBDIRS = auxdir/auxsub $(DIST_TEXLIBS) libs utils texk
+SUBDIRS = . $(MAKE_SUBDIRS) libs utils texk
+DIST_SUBDIRS = auxdir/auxsub $(CONF_SUBDIRS) libs utils texk
 
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
 cf_silent_1 =
 
-all-local: texlibs
-
-.PHONY: texlibs
-# We must configure all texk subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because other libraries were not built.
-#
-# Sequentially configure and optionally build all texk libraries;
-# code inspired by automake's way to handle recursive targets.
-texlibs: $(CONFIG_AUX)
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	list='$(DIST_TEXLIBS)'; for texlibs in $$list; do \
-	  if test ! -f $$texlibs/Makefile; then \
-	    test -d $$texlibs || $(MKDIR_P) $$texlibs; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$$texlibs,g"`; \
-	    case " $(TEXLIBS) " in \
-	      *" $$texlibs "*) skip=;; \
-	      *) skip=' --disable-build';; \
-	    esac; \
-	    (cd $$texlibs && echo "=== configuring in $$texlibs (`pwd`)" && \
-	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
-	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
-	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$texlibs failed"; exit 1; }) && \
-	    if test "x$$skip" = x; then \
-	      echo "Making all in $$texlibs" && \
-	      (cd $$texlibs && $(MAKE) $(AM_MAKEFLAGS) all); \
-	    fi || eval $$failcom; \
-	  fi; \
-	done; test -z "$$fail"
-
-subsubdir-conf.cmd:
-	@echo "configure in auxdir/auxsub failed to create the file $@"
-	exit 1
+## Configure and build subdirs.
+##
+recurse_this =
+recurse_top =
 
+include $(srcdir)/am/recurse.am
 
 # This is the default target for the Build script in TeX Live.
 .PHONY: world
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 8a333de160e..3199e008245 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -77,18 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog README \
-	build-aux/compile build-aux/config.guess build-aux/config.sub \
-	build-aux/depcomp build-aux/install-sh build-aux/missing \
-	build-aux/texinfo.tex build-aux/ylwrap build-aux/ltmain.sh \
+DIST_COMMON = $(srcdir)/am/recurse.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog README build-aux/compile \
+	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/missing build-aux/texinfo.tex \
+	build-aux/ylwrap build-aux/ltmain.sh \
 	$(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
 	$(top_srcdir)/build-aux/config.sub \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/ltmain.sh \
 	$(top_srcdir)/build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/m4/kpse-common.m4 \
@@ -322,6 +323,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONF_SUBDIRS = @CONF_SUBDIRS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -331,7 +333,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIST_TEXLIBS = @DIST_TEXLIBS@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -359,6 +360,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAKE_SUBDIRS = @MAKE_SUBDIRS@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -381,7 +383,6 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TEXLIBS = @TEXLIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
@@ -461,13 +462,21 @@ EXTRA_DIST = \
 	m4/README \
 	reautoconf
 
-CONFIG_AUX = subsubdir-conf.cmd
-SUBDIRS = . $(TEXLIBS) libs utils texk
-DIST_SUBDIRS = auxdir/auxsub $(DIST_TEXLIBS) libs utils texk
+SUBDIRS = . $(MAKE_SUBDIRS) libs utils texk
+DIST_SUBDIRS = auxdir/auxsub $(CONF_SUBDIRS) libs utils texk
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
 cf_silent_1 = 
+recurse_this = 
+recurse_top = 
+
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+# Code inspired by automake's way to handle recursive targets.
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
 # Run texlinks here since the binaries won't be there
 # at install-data, and fmtutil.cnf won't be there at install-exec,
 # and there is no install-hook or install-local.
@@ -481,7 +490,7 @@ all: all-recursive
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/recurse.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -504,6 +513,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/am/recurse.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -947,17 +957,10 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-all-local: texlibs
+all-local: recurse
 
-.PHONY: texlibs
-# We must configure all texk subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because other libraries were not built.
-#
-# Sequentially configure and optionally build all texk libraries;
-# code inspired by automake's way to handle recursive targets.
-texlibs: $(CONFIG_AUX)
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -965,28 +968,28 @@ texlibs: $(CONFIG_AUX)
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
-	list='$(DIST_TEXLIBS)'; for texlibs in $$list; do \
-	  if test ! -f $$texlibs/Makefile; then \
-	    test -d $$texlibs || $(MKDIR_P) $$texlibs; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$$texlibs,g"`; \
-	    case " $(TEXLIBS) " in \
-	      *" $$texlibs "*) skip=;; \
+	list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+	  if test ! -f $$one_dir/Makefile; then \
+	    test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+	    case " $(MAKE_SUBDIRS) " in \
+	      *" $$one_dir "*) skip=;; \
 	      *) skip=' --disable-build';; \
 	    esac; \
-	    (cd $$texlibs && echo "=== configuring in $$texlibs (`pwd`)" && \
+	    (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
 	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
 	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
 	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$texlibs failed"; exit 1; }) && \
+	        { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
 	    if test "x$$skip" = x; then \
-	      echo "Making all in $$texlibs" && \
-	      (cd $$texlibs && $(MAKE) $(AM_MAKEFLAGS) all); \
+	      echo "Making all in $$one_dir" && \
+	      (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
 	    fi || eval $$failcom; \
 	  fi; \
 	done; test -z "$$fail"
 
-subsubdir-conf.cmd:
-	@echo "configure in auxdir/auxsub failed to create the file $@"
+$(CONFIG_AUX):
+	@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
 	exit 1
 
 # This is the default target for the Build script in TeX Live.
diff --git a/Build/source/am/rebuild.am b/Build/source/am/rebuild.am
index 9b53015b192..2713eb287fc 100644
--- a/Build/source/am/rebuild.am
+++ b/Build/source/am/rebuild.am
@@ -19,15 +19,16 @@ rebuild: $(rebuild_prereq)
 	    *n*) dry=:;; \
 	  esac; \
 	done; \
-	$$dry rm -f rebuild.stamp; \
-	$$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
-	if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	  $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
-	  $$dry rmdir rebuild.lock; \
-	else \
-	  while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	fi; \
-	$$dry test -f rebuild.stamp
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 CLEANFILES += rebuild.stamp
 
diff --git a/Build/source/am/reconfig.am b/Build/source/am/reconfig.am
new file mode 100644
index 00000000000..55e77fcbf27
--- /dev/null
+++ b/Build/source/am/reconfig.am
@@ -0,0 +1,25 @@
+## am/reconfig.am: Makefile fragment to reconfigure a directory.
+##
+## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## requires $(reconfig_prereq) and DISTCLEANFILES.
+##
+## Serialize concurrent reconfig attempts
+## Compare Automake manual (info Automake) 27.9: Multiple Outputs
+##
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+
+DISTCLEANFILES += config.force
+
diff --git a/Build/source/am/recurse.am b/Build/source/am/recurse.am
new file mode 100644
index 00000000000..060a23b534b
--- /dev/null
+++ b/Build/source/am/recurse.am
@@ -0,0 +1,50 @@
+## am/recurse.am: Makefile fragment to configure and build subdirs.
+##
+## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## requires $(recurse_this) and $(recurse_top).
+##
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+# Code inspired by automake's way to handle recursive targets.
+##
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
+
+all-local: recurse
+
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+	  if test ! -f $$one_dir/Makefile; then \
+	    test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+	    case " $(MAKE_SUBDIRS) " in \
+	      *" $$one_dir "*) skip=;; \
+	      *) skip=' --disable-build';; \
+	    esac; \
+	    (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
+	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
+	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
+	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
+	        { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
+	    if test "x$$skip" = x; then \
+	      echo "Making all in $$one_dir" && \
+	      (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
+	    fi || eval $$failcom; \
+	  fi; \
+	done; test -z "$$fail"
+
+$(CONFIG_AUX):
+	@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
+	exit 1
+
diff --git a/Build/source/configure b/Build/source/configure
index dc4df910db5..4f5dee98ad7 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -642,8 +642,8 @@ cross_TRUE
 ICU_CONFIG
 FT2_CONFIG
 PKG_CONFIG
-DIST_TEXLIBS
-TEXLIBS
+CONF_SUBDIRS
+MAKE_SUBDIRS
 subdirs
 CXXCPP
 WARNING_CXXFLAGS
@@ -20250,17 +20250,17 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeX specific libraries to build" >&5
 $as_echo_n "checking for TeX specific libraries to build... " >&6; }
-TEXLIBS=
-DIST_TEXLIBS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 
 
 
 if test -x $srcdir/texk/ptexenc/configure; then
   if test "x$with_system_ptexenc" != xyes && \
      test "x$need_ptexenc" = xyes; then
-    TEXLIBS="texk/ptexenc $TEXLIBS"
+    MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
   fi
-  DIST_TEXLIBS="texk/ptexenc $DIST_TEXLIBS"
+  CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs texk/ptexenc"
 
@@ -20271,9 +20271,9 @@ fi
 if test -x $srcdir/texk/kpathsea/configure; then
   if test "x$with_system_kpathsea" != xyes && \
      test "x$need_kpathsea" = xyes; then
-    TEXLIBS="texk/kpathsea $TEXLIBS"
+    MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
   fi
-  DIST_TEXLIBS="texk/kpathsea $DIST_TEXLIBS"
+  CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs texk/kpathsea"
 
@@ -20283,8 +20283,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXLIBS" >&5
-$as_echo "$TEXLIBS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
+$as_echo "$MAKE_SUBDIRS" >&6; }
 
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index d5a1730195c..242e4c7cbf7 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -112,25 +112,25 @@ if test "x$enable_web2c" = xyes && test "x$with_system_kpathsea" = xyes; then
 fi
 
 AC_MSG_CHECKING([for TeX specific libraries to build])
-TEXLIBS=
-DIST_TEXLIBS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 KPSE_FOR_PKGS([texlibs], [
 if test -x $srcdir/texk/Kpse_Pkg/configure; then
   if test "x$with_system_[]Kpse_pkg" != xyes && \
      test "x$need_[]Kpse_pkg" = xyes; then
-    TEXLIBS="texk/Kpse_Pkg $TEXLIBS"    
+    MAKE_SUBDIRS="texk/Kpse_Pkg $MAKE_SUBDIRS"    
   fi
 dnl Cause 'make dist' to recurse into all texlibs dirs
-  DIST_TEXLIBS="texk/Kpse_Pkg $DIST_TEXLIBS"
+  CONF_SUBDIRS="texk/Kpse_Pkg $CONF_SUBDIRS"
 dnl Cause 'configure -hr' and 'autoreconf' to recurse into all texlibs dirs
   if false; then
     AC_CONFIG_SUBDIRS([texk/]Kpse_Pkg)
   fi
 fi
 ])
-AC_SUBST([TEXLIBS])
-AC_SUBST([DIST_TEXLIBS])
-AC_MSG_RESULT([$TEXLIBS])
+AC_SUBST([MAKE_SUBDIRS])
+AC_SUBST([CONF_SUBDIRS])
+AC_MSG_RESULT([$MAKE_SUBDIRS])
 
 dnl We check that all required system libraries are usable, and may
 dnl reduce frustration if anything is wrong by doing this first.
diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog
index a92317e8610..49de9f0db4f 100644
--- a/Build/source/libs/ChangeLog
+++ b/Build/source/libs/ChangeLog
@@ -1,6 +1,8 @@
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* am/*.am: Removed Makefile fragment to ../am/.
+	* am/*.am: Moved Makefile fragments to ../am/.
+
+	* Makefile.am, configure.ac: Use am/recurse.am.
 
 2013-01-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am
index e0807953111..7fa40d91edf 100644
--- a/Build/source/libs/Makefile.am
+++ b/Build/source/libs/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am for the TeX Live subdirectory libs/
 ##
-## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## Use 'aclocal --force' (for "computed m4_sinclude")
 ##
 ACLOCAL_AMFLAGS = -I ../m4 --force
 
-SUBDIRS = . $(SUBLIBS)
-DIST_SUBDIRS = $(DIST_SUBLIBS)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
@@ -19,47 +19,10 @@ cf_silent_1 =
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-CONFIG_AUX = ../subsubdir-conf.cmd
-
-all-local: sublibs
-
-.PHONY: sublibs
-# We must configure all libs subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because other libraries were not built.
-#
-# Sequentially configure and optionally build all libs subdirs;
-# code inspired by automake's way to handle recursive targets.
-sublibs: $(CONFIG_AUX)
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	list='$(DIST_SUBLIBS)'; for sublibs in $$list; do \
-	  if test ! -f $$sublibs/Makefile; then \
-	    test -d $$sublibs || $(MKDIR_P) $$sublibs; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,libs/$$sublibs,g"`; \
-	    case " $(SUBLIBS) " in \
-	      *" $$sublibs "*) skip=;; \
-	      *) skip=' --disable-build';; \
-	    esac; \
-	    (cd $$sublibs && echo "=== configuring in $$sublibs (`pwd`)" && \
-	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
-	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
-	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$sublibs failed"; exit 1; }) && \
-	    if test "x$$skip" = x; then \
-	      echo "Making all in $$sublibs" && \
-	      (cd $$sublibs && $(MAKE) $(AM_MAKEFLAGS) all); \
-	    fi || eval $$failcom; \
-	  fi; \
-	done; test -z "$$fail"
+## Configure and build subdirs.
+##
+recurse_this = libs/
+recurse_top = ../
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
-	exit 1
+include $(srcdir)/../am/recurse.am
 
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 98eb05ee90d..cfa202edea0 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -77,18 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog README \
-	../build-aux/compile ../build-aux/config.guess \
-	../build-aux/config.sub ../build-aux/depcomp \
-	../build-aux/install-sh ../build-aux/missing \
-	../build-aux/texinfo.tex ../build-aux/ylwrap \
-	../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
+DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog README ../build-aux/compile \
+	../build-aux/config.guess ../build-aux/config.sub \
+	../build-aux/depcomp ../build-aux/install-sh \
+	../build-aux/missing ../build-aux/texinfo.tex \
+	../build-aux/ylwrap ../build-aux/ltmain.sh \
+	$(top_srcdir)/../build-aux/compile \
 	$(top_srcdir)/../build-aux/config.guess \
 	$(top_srcdir)/../build-aux/config.sub \
 	$(top_srcdir)/../build-aux/install-sh \
 	$(top_srcdir)/../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-common.m4 \
@@ -303,11 +304,11 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONF_SUBDIRS = @CONF_SUBDIRS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIST_SUBLIBS = @DIST_SUBLIBS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -323,6 +324,7 @@ LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAKE_SUBDIRS = @MAKE_SUBDIRS@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -336,7 +338,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUBLIBS = @SUBLIBS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 abs_builddir = @abs_builddir@
@@ -391,19 +392,27 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../m4 --force
-SUBDIRS = . $(SUBLIBS)
-DIST_SUBDIRS = $(DIST_SUBLIBS)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
 cf_silent_1 = 
-CONFIG_AUX = ../subsubdir-conf.cmd
+recurse_this = libs/
+recurse_top = ../
+
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+# Code inspired by automake's way to handle recursive targets.
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
 all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -426,6 +435,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../am/recurse.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -858,17 +868,10 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-all-local: sublibs
+all-local: recurse
 
-.PHONY: sublibs
-# We must configure all libs subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because other libraries were not built.
-#
-# Sequentially configure and optionally build all libs subdirs;
-# code inspired by automake's way to handle recursive targets.
-sublibs: $(CONFIG_AUX)
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -876,28 +879,28 @@ sublibs: $(CONFIG_AUX)
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
-	list='$(DIST_SUBLIBS)'; for sublibs in $$list; do \
-	  if test ! -f $$sublibs/Makefile; then \
-	    test -d $$sublibs || $(MKDIR_P) $$sublibs; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,libs/$$sublibs,g"`; \
-	    case " $(SUBLIBS) " in \
-	      *" $$sublibs "*) skip=;; \
+	list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+	  if test ! -f $$one_dir/Makefile; then \
+	    test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+	    case " $(MAKE_SUBDIRS) " in \
+	      *" $$one_dir "*) skip=;; \
 	      *) skip=' --disable-build';; \
 	    esac; \
-	    (cd $$sublibs && echo "=== configuring in $$sublibs (`pwd`)" && \
+	    (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
 	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
 	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
 	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$sublibs failed"; exit 1; }) && \
+	        { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
 	    if test "x$$skip" = x; then \
-	      echo "Making all in $$sublibs" && \
-	      (cd $$sublibs && $(MAKE) $(AM_MAKEFLAGS) all); \
+	      echo "Making all in $$one_dir" && \
+	      (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
 	    fi || eval $$failcom; \
 	  fi; \
 	done; test -z "$$fail"
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
+$(CONFIG_AUX):
+	@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
 	exit 1
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 6a3889d7dc0..f6593f901c3 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* cairo/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am
index e392d62b1dd..bc6cd471bc9 100644
--- a/Build/source/libs/cairo/Makefile.am
+++ b/Build/source/libs/cairo/Makefile.am
@@ -9,10 +9,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: config.force all
-
 ## We want to re-distribute the whole original cairo source tree.
 ##
 EXTRA_DIST = $(CAIRO_TREE)
@@ -230,15 +226,6 @@ endif CAIRO_HAS_GL_SURFACE
 
 $(libcairo_a_OBJECTS): config.force
 
-config.force: $(PIXMAN_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force
-
-## Rebuild pixman
-@PIXMAN_RULE@
-
 if build
 check_PROGRAMS = cairotst
 dist_check_SCRIPTS = cairo.test
@@ -253,5 +240,19 @@ cairotst_DEPENDENCIES = $(PIXMAN_DEPEND)
 
 LDADD = libcairo.a $(PIXMAN_LIBS)
 
-## Files generated by TESTS
+## Rebuild pixman
+@PIXMAN_RULE@
+
+# Reconfig
+reconfig_prereq = $(PIXMAN_DEPEND)
+DISTCLEANFILES =
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
 
diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in
index f7eeb5c104d..d631d18eacc 100644
--- a/Build/source/libs/cairo/Makefile.in
+++ b/Build/source/libs/cairo/Makefile.in
@@ -144,11 +144,11 @@ host_triplet = @host@
 @CAIRO_HAS_GL_SURFACE_TRUE@	@CAIRO_TREE@/src/cairo-gl-surface.c
 
 @build_TRUE@check_PROGRAMS = cairotst$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/cairo-features.h.in \
-	$(am__dist_check_SCRIPTS_DIST) \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(srcdir)/cairo-features.h.in $(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog README \
 	../../build-aux/compile ../../build-aux/config.guess \
@@ -161,6 +161,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
 	$(top_srcdir)/m4/cairo-features.m4 $(top_srcdir)/m4/float.m4 \
@@ -1006,13 +1007,21 @@ libcairo_a_SOURCES = @CAIRO_TREE@/src/cairo-analysis-surface.c \
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8) $(am__append_9) $(am__append_10)
-DISTCLEANFILES = config.force
 @build_TRUE@dist_check_SCRIPTS = cairo.test
 @build_TRUE@TESTS = cairo.test
 cairotst_SOURCES = cairotst.c
 cairotst_CPPFLAGS = $(PIXMAN_INCLUDES) -Icairo
 cairotst_DEPENDENCIES = $(PIXMAN_DEPEND)
 LDADD = libcairo.a $(PIXMAN_LIBS)
+
+# Reconfig
+reconfig_prereq = $(PIXMAN_DEPEND)
+DISTCLEANFILES = config.force
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h cairo-features.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -1020,7 +1029,7 @@ all: config.h cairo-features.h
 .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1043,6 +1052,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -2180,6 +2190,7 @@ mostlyclean-generic:
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -2285,10 +2296,6 @@ uninstall-am:
 	recheck tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: config.force all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.lo' -o -name '*.$(OBJEXT)'`
@@ -2296,11 +2303,40 @@ dist-hook:
 
 $(libcairo_a_OBJECTS): config.force
 
-config.force: $(PIXMAN_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @PIXMAN_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/cairo/cairotst.c b/Build/source/libs/cairo/cairotst.c
index d8665155359..5e42d74e5f1 100644
--- a/Build/source/libs/cairo/cairotst.c
+++ b/Build/source/libs/cairo/cairotst.c
@@ -10,7 +10,7 @@
 
 int main (int argc, char **argv)
 {
-  printf ("%s: using pixman %s\n", argv[0], pixman_version_string ());
-  printf ("%s: using cairo %s\n", argv[0], cairo_version_string ());
+  printf ("%s: using pixman version %s\n", argv[0], pixman_version_string ());
+  printf ("%s: using cairo version %s\n", argv[0], cairo_version_string ());
   return 0;
 }
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index dcb5818d0ae..db0ba34227c 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -590,8 +590,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-DIST_SUBLIBS
-SUBLIBS
+CONF_SUBDIRS
+MAKE_SUBDIRS
 subdirs
 WARNING_CFLAGS
 MAINT
@@ -6271,17 +6271,17 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic libraries to build" >&5
 $as_echo_n "checking for generic libraries to build... " >&6; }
-SUBLIBS=
-DIST_SUBLIBS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 
 
 
 if test -x $srcdir/harfbuzz/configure; then
   if test "x$with_system_harfbuzz" != xyes && \
      test "x$need_harfbuzz" = xyes; then
-    SUBLIBS="harfbuzz $SUBLIBS"
+    MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="harfbuzz $DIST_SUBLIBS"
+  CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs harfbuzz"
 
@@ -6292,9 +6292,9 @@ fi
 if test -x $srcdir/icu/configure; then
   if test "x$with_system_icu" != xyes && \
      test "x$need_icu" = xyes; then
-    SUBLIBS="icu $SUBLIBS"
+    MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="icu $DIST_SUBLIBS"
+  CONF_SUBDIRS="icu $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs icu"
 
@@ -6305,9 +6305,9 @@ fi
 if test -x $srcdir/teckit/configure; then
   if test "x$with_system_teckit" != xyes && \
      test "x$need_teckit" = xyes; then
-    SUBLIBS="teckit $SUBLIBS"
+    MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="teckit $DIST_SUBLIBS"
+  CONF_SUBDIRS="teckit $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs teckit"
 
@@ -6318,9 +6318,9 @@ fi
 if test -x $srcdir/graphite2/configure; then
   if test "x$with_system_graphite2" != xyes && \
      test "x$need_graphite2" = xyes; then
-    SUBLIBS="graphite2 $SUBLIBS"
+    MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="graphite2 $DIST_SUBLIBS"
+  CONF_SUBDIRS="graphite2 $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs graphite2"
 
@@ -6331,9 +6331,9 @@ fi
 if test -x $srcdir/zziplib/configure; then
   if test "x$with_system_zziplib" != xyes && \
      test "x$need_zziplib" = xyes; then
-    SUBLIBS="zziplib $SUBLIBS"
+    MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="zziplib $DIST_SUBLIBS"
+  CONF_SUBDIRS="zziplib $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs zziplib"
 
@@ -6344,9 +6344,9 @@ fi
 if test -x $srcdir/xpdf/configure; then
   if test "x$with_system_xpdf" != xyes && \
      test "x$need_xpdf" = xyes; then
-    SUBLIBS="xpdf $SUBLIBS"
+    MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="xpdf $DIST_SUBLIBS"
+  CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs xpdf"
 
@@ -6357,9 +6357,9 @@ fi
 if test -x $srcdir/poppler/configure; then
   if test "x$with_system_poppler" != xyes && \
      test "x$need_poppler" = xyes; then
-    SUBLIBS="poppler $SUBLIBS"
+    MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="poppler $DIST_SUBLIBS"
+  CONF_SUBDIRS="poppler $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs poppler"
 
@@ -6370,9 +6370,9 @@ fi
 if test -x $srcdir/cairo/configure; then
   if test "x$with_system_cairo" != xyes && \
      test "x$need_cairo" = xyes; then
-    SUBLIBS="cairo $SUBLIBS"
+    MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="cairo $DIST_SUBLIBS"
+  CONF_SUBDIRS="cairo $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs cairo"
 
@@ -6383,9 +6383,9 @@ fi
 if test -x $srcdir/pixman/configure; then
   if test "x$with_system_pixman" != xyes && \
      test "x$need_pixman" = xyes; then
-    SUBLIBS="pixman $SUBLIBS"
+    MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="pixman $DIST_SUBLIBS"
+  CONF_SUBDIRS="pixman $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs pixman"
 
@@ -6396,9 +6396,9 @@ fi
 if test -x $srcdir/potrace/configure; then
   if test "x$with_system_potrace" != xyes && \
      test "x$need_potrace" = xyes; then
-    SUBLIBS="potrace $SUBLIBS"
+    MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="potrace $DIST_SUBLIBS"
+  CONF_SUBDIRS="potrace $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs potrace"
 
@@ -6409,9 +6409,9 @@ fi
 if test -x $srcdir/gd/configure; then
   if test "x$with_system_gd" != xyes && \
      test "x$need_gd" = xyes; then
-    SUBLIBS="gd $SUBLIBS"
+    MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="gd $DIST_SUBLIBS"
+  CONF_SUBDIRS="gd $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs gd"
 
@@ -6422,9 +6422,9 @@ fi
 if test -x $srcdir/freetype2/configure; then
   if test "x$with_system_freetype2" != xyes && \
      test "x$need_freetype2" = xyes; then
-    SUBLIBS="freetype2 $SUBLIBS"
+    MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="freetype2 $DIST_SUBLIBS"
+  CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs freetype2"
 
@@ -6435,9 +6435,9 @@ fi
 if test -x $srcdir/freetype/configure; then
   if test "x$with_system_freetype" != xyes && \
      test "x$need_freetype" = xyes; then
-    SUBLIBS="freetype $SUBLIBS"
+    MAKE_SUBDIRS="freetype $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="freetype $DIST_SUBLIBS"
+  CONF_SUBDIRS="freetype $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs freetype"
 
@@ -6448,9 +6448,9 @@ fi
 if test -x $srcdir/libpng/configure; then
   if test "x$with_system_libpng" != xyes && \
      test "x$need_libpng" = xyes; then
-    SUBLIBS="libpng $SUBLIBS"
+    MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="libpng $DIST_SUBLIBS"
+  CONF_SUBDIRS="libpng $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs libpng"
 
@@ -6461,9 +6461,9 @@ fi
 if test -x $srcdir/lua52/configure; then
   if test "x$with_system_lua52" != xyes && \
      test "x$need_lua52" = xyes; then
-    SUBLIBS="lua52 $SUBLIBS"
+    MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="lua52 $DIST_SUBLIBS"
+  CONF_SUBDIRS="lua52 $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs lua52"
 
@@ -6474,9 +6474,9 @@ fi
 if test -x $srcdir/zlib/configure; then
   if test "x$with_system_zlib" != xyes && \
      test "x$need_zlib" = xyes; then
-    SUBLIBS="zlib $SUBLIBS"
+    MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
   fi
-  DIST_SUBLIBS="zlib $DIST_SUBLIBS"
+  CONF_SUBDIRS="zlib $CONF_SUBDIRS"
   if false; then
     subdirs="$subdirs zlib"
 
@@ -6486,8 +6486,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUBLIBS" >&5
-$as_echo "$SUBLIBS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
+$as_echo "$MAKE_SUBDIRS" >&6; }
 
 ac_config_files="$ac_config_files Makefile"
 
diff --git a/Build/source/libs/configure.ac b/Build/source/libs/configure.ac
index 1428b373122..998adeca666 100644
--- a/Build/source/libs/configure.ac
+++ b/Build/source/libs/configure.ac
@@ -21,25 +21,25 @@ KPSE_BASIC([libs])
 AC_PROG_MKDIR_P
 
 AC_MSG_CHECKING([for generic libraries to build])
-SUBLIBS=
-DIST_SUBLIBS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 KPSE_FOR_PKGS([libs], [
 if test -x $srcdir/Kpse_Pkg/configure; then
   if test "x$with_system_[]Kpse_pkg" != xyes && \
      test "x$need_[]Kpse_pkg" = xyes; then
-    SUBLIBS="Kpse_Pkg $SUBLIBS"    
+    MAKE_SUBDIRS="Kpse_Pkg $MAKE_SUBDIRS"    
   fi
 dnl Cause 'make dist' to recurse into all sublibs dirs
-  DIST_SUBLIBS="Kpse_Pkg $DIST_SUBLIBS"
+  CONF_SUBDIRS="Kpse_Pkg $CONF_SUBDIRS"
 dnl Cause 'configure -hr' and 'autoreconf' to recurse into all sublibs dirs
   if false; then
     AC_CONFIG_SUBDIRS(Kpse_Pkg)
   fi
 fi
 ])
-AC_SUBST([SUBLIBS])
-AC_SUBST([DIST_SUBLIBS])
-AC_MSG_RESULT([$SUBLIBS])
+AC_SUBST([MAKE_SUBDIRS])
+AC_SUBST([CONF_SUBDIRS])
+AC_MSG_RESULT([$MAKE_SUBDIRS])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/Build/source/libs/freetype/ChangeLog b/Build/source/libs/freetype/ChangeLog
index c37a0ada1c0..20256b74a59 100644
--- a/Build/source/libs/freetype/ChangeLog
+++ b/Build/source/libs/freetype/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2012-12-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_BASIC.
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am
index b7e41ed0de3..3eb7280120b 100644
--- a/Build/source/libs/freetype/Makefile.am
+++ b/Build/source/libs/freetype/Makefile.am
@@ -1,6 +1,6 @@
 ## Wrapper Makefile.am to build FreeType for TeX Live.
 ##
-##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -8,14 +8,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original FreeType source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
 EXTRA_DIST = $(FREETYPE_TREE)
 
 # in case of an SVN repository
@@ -48,3 +42,10 @@ libttf.a: ft-build/Makefile
 clean-local:
 	rm -rf libttf.a freetype ft-build ft-install
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in
index 40c0cb049f3..c49816903d7 100644
--- a/Build/source/libs/freetype/Makefile.in
+++ b/Build/source/libs/freetype/Makefile.in
@@ -76,17 +76,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog \
-	../../build-aux/compile ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
-	../../build-aux/ltmain.sh \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog ../../build-aux/compile \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/missing ../../build-aux/texinfo.tex \
+	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -227,12 +227,17 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(FREETYPE_TREE)
 noinst_DATA = libttf.a
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: all-am
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -255,6 +260,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -462,6 +468,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -556,10 +563,6 @@ uninstall-am:
 	uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
@@ -587,6 +590,27 @@ libttf.a: ft-build/Makefile
 
 clean-local:
 	rm -rf libttf.a freetype ft-build ft-install
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog
index f8bd27d9e54..a201ea1babf 100644
--- a/Build/source/libs/freetype2/ChangeLog
+++ b/Build/source/libs/freetype2/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-06-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import freetype-2.5.0.1.
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 41150581d7a..b162766d539 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -1,6 +1,6 @@
 ## Wrapper Makefile.am to build FreeType for TeX Live.
 ##
-##   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
@@ -8,10 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original FreeType source tree.
 ##
 EXTRA_DIST = $(FREETYPE_TREE)
@@ -59,3 +55,10 @@ libfreetype.a: ft-config
 clean-local:
 	rm -rf freetype2 ft2build.h ft-* libfreetype.* pkgconfig
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index 0a64df5bcd5..b41412fe8db 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -76,17 +76,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog \
-	../../build-aux/compile ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
-	../../build-aux/ltmain.sh \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog ../../build-aux/compile \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/missing ../../build-aux/texinfo.tex \
+	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -227,12 +227,17 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(FREETYPE_TREE) $(FREETYPE_TREE)-PATCHES
 noinst_DATA = libfreetype.a
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: all-am
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -255,6 +260,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -462,6 +468,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -556,10 +563,6 @@ uninstall-am:
 	uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
@@ -596,6 +599,27 @@ libfreetype.a: ft-config
 
 clean-local:
 	rm -rf freetype2 ft2build.h ft-* libfreetype.* pkgconfig
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog
index ebd1a50d38a..e0b2d76b66b 100644
--- a/Build/source/libs/gd/ChangeLog
+++ b/Build/source/libs/gd/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index 2a6a57dc882..950925cce17 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -8,10 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original libgd source tree.
 ##
 EXTRA_DIST = $(GD_TREE)
@@ -104,14 +100,21 @@ libgd_a_SOURCES = \
 
 $(libgd_a_OBJECTS): config.force
 
-config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force
-
 ## Rebuild libpng
 @LIBPNG_RULE@
 ## Rebuild libfreetype
 @FREETYPE2_RULE@
 
+# Reconfig
+reconfig_prereq = $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
+DISTCLEANFILES =
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index 61b3ad5483c..da1048ce098 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -79,21 +79,23 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WIN32_TRUE@am__append_1 = -DNONDLL -DBGDWIN32
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
-	ChangeLog README ../../build-aux/compile \
-	../../build-aux/config.guess ../../build-aux/config.sub \
-	../../build-aux/depcomp ../../build-aux/install-sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(top_srcdir)/../../build-aux/depcomp ChangeLog README \
+	../../build-aux/compile ../../build-aux/config.guess \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/install-sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
+	../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
@@ -467,7 +469,15 @@ libgd_a_SOURCES = \
 	@GD_TREE@/src/wbmp.c \
 	@GD_TREE@/src/webpimg.c
 
+
+# Reconfig
+reconfig_prereq = $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
 DISTCLEANFILES = config.force
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -475,7 +485,7 @@ all: config.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -498,6 +508,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1034,6 +1045,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1140,10 +1152,6 @@ uninstall-am:
 	uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
@@ -1171,12 +1179,41 @@ dist-hook:
 
 $(libgd_a_OBJECTS): config.force
 
-config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @LIBPNG_RULE@
 @FREETYPE2_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 5b5561cde2d..120b7e80d3b 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,11 +1,10 @@
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* Makefile.am: Use ../am/rebuild.am.
+	* Makefile.am: Use ../../am/rebuild.am.
 
 	* graphite2.test (new): Shell script for a basic test.
 	* gr2test.c (new): Source code for test program.
 
-
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/graphite2/Makefile.am:
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index ed0ac04ada2..60619a30c55 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -1733,15 +1733,16 @@ rebuild: $(rebuild_prereq)
 	    *n*) dry=:;; \
 	  esac; \
 	done; \
-	$$dry rm -f rebuild.stamp; \
-	$$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
-	if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	  $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
-	  $$dry rmdir rebuild.lock; \
-	else \
-	  while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	fi; \
-	$$dry test -f rebuild.stamp
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/graphite2/gr2test.c b/Build/source/libs/graphite2/gr2test.c
index 1e877f77fee..20b7965fb49 100644
--- a/Build/source/libs/graphite2/gr2test.c
+++ b/Build/source/libs/graphite2/gr2test.c
@@ -15,6 +15,6 @@ int main (int argc, char **argv)
   int nMajor, nMinor, nBugFix;
 
   gr_engine_version(&nMajor, &nMinor, &nBugFix);
-  printf ("%s: using graphite2 %d.%d.%d\n", argv[0], nMajor, nMinor, nBugFix);
+  printf ("%s: using Graphite2 version %d.%d.%d\n", argv[0], nMajor, nMinor, nBugFix);
   return 0;
 }
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 79e9e508fb2..aea0b2cdc10 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
+	* harfbuzz.test (new): Shell script for a basic test.
+	* hbtest.c (new): Source code for test program.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index d469e36914d..5479ae821d5 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -8,10 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original harfbuzz source tree.
 ##
 EXTRA_DIST = $(HARFBUZZ_TREE)
@@ -117,24 +113,36 @@ libharfbuzz_a_SOURCES += @HARFBUZZ_TREE@/src/hb-graphite2.cc
 
 $(libharfbuzz_a_OBJECTS): config.force
 
-config.force: $(libharfbuzz_dependencies)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
+if build
+check_PROGRAMS = hbtest
+dist_check_SCRIPTS = harfbuzz.test
+TESTS = harfbuzz.test
+endif build
+
+hbtest_SOURCES = hbtest.c
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_hbtest_SOURCES = dummy.cxx
 
-DISTCLEANFILES = config.force
+hbtest_CPPFLAGS = -Iinclude $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES)
+
+LDADD = libharfbuzz.a $(ICU_LIBS) $(GRAPHITE2_LIBS)
 
 ## Rebuild libsicuxxx
 @ICU_RULE@
 ## Rebuild libgraphite2
 @GRAPHITE2_RULE@
 
-##if build
-## check_PROGRAMS = 
-## dist_check_SCRIPTS = harfbuzz.test
-## TESTS = harfbuzz.test
-## endif build
+# Reconfig
+reconfig_prereq = $(libharfbuzz_dependencies)
+DISTCLEANFILES =
+
+include $(srcdir)/../../am/reconfig.am
 
-LDADD = libharfbuzz.a
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
 
-## Files generated by TESTS
+include $(srcdir)/../../am/rebuild.am
 
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index f679b938e95..aa70e810e6f 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -78,12 +78,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in \
+@build_TRUE@check_PROGRAMS = hbtest$(EXEEXT)
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
 	$(top_srcdir)/harfbuzz-0.9.18/src/hb-version.h.in \
-	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
+	$(am__dist_check_SCRIPTS_DIST) \
+	$(top_srcdir)/../../build-aux/depcomp \
+	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/missing \
@@ -95,6 +98,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
@@ -155,6 +159,17 @@ am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-icu.$(OBJEXT) \
 	@HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT)
 libharfbuzz_a_OBJECTS = $(am_libharfbuzz_a_OBJECTS)
+am_hbtest_OBJECTS = hbtest-hbtest.$(OBJEXT)
+hbtest_OBJECTS = $(am_hbtest_OBJECTS)
+hbtest_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+hbtest_DEPENDENCIES = libharfbuzz.a $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am__dist_check_SCRIPTS_DIST = harfbuzz.test
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -171,28 +186,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -211,8 +204,27 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libharfbuzz_a_SOURCES)
-DIST_SOURCES = $(libharfbuzz_a_SOURCES)
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libharfbuzz_a_SOURCES) $(hbtest_SOURCES) \
+	$(nodist_EXTRA_hbtest_SOURCES)
+DIST_SOURCES = $(libharfbuzz_a_SOURCES) $(hbtest_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -233,7 +245,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope check recheck distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -255,6 +267,207 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='[0;31m'; \
+    grn='[0;32m'; \
+    lgn='[1;32m'; \
+    blu='[1;34m'; \
+    mgn='[0;35m'; \
+    brg='[1m'; \
+    std='[m'; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -516,16 +729,31 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \
 	@HARFBUZZ_TREE@/src/hb-ot-shape-private.hh \
 	@HARFBUZZ_TREE@/src/hb-icu.cc \
 	@HARFBUZZ_TREE@/src/hb-graphite2.cc
+@build_TRUE@dist_check_SCRIPTS = harfbuzz.test
+@build_TRUE@TESTS = harfbuzz.test
+hbtest_SOURCES = hbtest.c
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_hbtest_SOURCES = dummy.cxx
+hbtest_CPPFLAGS = -Iinclude $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES)
+LDADD = libharfbuzz.a $(ICU_LIBS) $(GRAPHITE2_LIBS)
+
+# Reconfig
+reconfig_prereq = $(libharfbuzz_dependencies)
 DISTCLEANFILES = config.force
-LDADD = libharfbuzz.a
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .c .cc .cxx .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -548,6 +776,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -673,6 +902,19 @@ libharfbuzz.a: $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_DEPENDENCIES) $(EXTRA_li
 	$(AM_V_AR)$(libharfbuzz_a_AR) libharfbuzz.a $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libharfbuzz.a
 
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+hbtest$(EXEEXT): $(hbtest_OBJECTS) $(hbtest_DEPENDENCIES) $(EXTRA_hbtest_DEPENDENCIES) 
+	@rm -f hbtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(hbtest_OBJECTS) $(hbtest_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f @HARFBUZZ_TREE@/src/*.$(OBJEXT)
@@ -680,6 +922,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbtest-hbtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-blob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer-serialize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-buffer.Po@am__quote@
@@ -709,6 +953,44 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-unicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-warning.Po@am__quote@
 
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+hbtest-hbtest.o: hbtest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbtest-hbtest.o -MD -MP -MF $(DEPDIR)/hbtest-hbtest.Tpo -c -o hbtest-hbtest.o `test -f 'hbtest.c' || echo '$(srcdir)/'`hbtest.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-hbtest.Tpo $(DEPDIR)/hbtest-hbtest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hbtest.c' object='hbtest-hbtest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbtest-hbtest.o `test -f 'hbtest.c' || echo '$(srcdir)/'`hbtest.c
+
+hbtest-hbtest.obj: hbtest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbtest-hbtest.obj -MD -MP -MF $(DEPDIR)/hbtest-hbtest.Tpo -c -o hbtest-hbtest.obj `if test -f 'hbtest.c'; then $(CYGPATH_W) 'hbtest.c'; else $(CYGPATH_W) '$(srcdir)/hbtest.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-hbtest.Tpo $(DEPDIR)/hbtest-hbtest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hbtest.c' object='hbtest-hbtest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbtest-hbtest.obj `if test -f 'hbtest.c'; then $(CYGPATH_W) 'hbtest.c'; else $(CYGPATH_W) '$(srcdir)/hbtest.c'; fi`
+
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -733,6 +1015,44 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
+hbtest-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hbtest-dummy.o -MD -MP -MF $(DEPDIR)/hbtest-dummy.Tpo -c -o hbtest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-dummy.Tpo $(DEPDIR)/hbtest-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='dummy.cxx' object='hbtest-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hbtest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+hbtest-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hbtest-dummy.obj -MD -MP -MF $(DEPDIR)/hbtest-dummy.Tpo -c -o hbtest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hbtest-dummy.Tpo $(DEPDIR)/hbtest-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='dummy.cxx' object='hbtest-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hbtest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
+.cxx.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -848,6 +1168,162 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -1039,6 +1515,9 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \
+	  $(dist_check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile $(LIBRARIES) config.h
 installdirs: installdirs-recursive
@@ -1063,8 +1542,12 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1078,12 +1561,12 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf @HARFBUZZ_TREE@/src/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) @HARFBUZZ_TREE@/src/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -1131,7 +1614,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf @HARFBUZZ_TREE@/src/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) @HARFBUZZ_TREE@/src/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1150,14 +1633,15 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool clean-noinstLIBRARIES cscope cscopelist-am ctags \
-	ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	am--refresh check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-cscope clean-generic clean-libtool \
+	clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
@@ -1167,14 +1651,10 @@ uninstall-am:
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
@@ -1182,12 +1662,41 @@ dist-hook:
 
 $(libharfbuzz_a_OBJECTS): config.force
 
-config.force: $(libharfbuzz_dependencies)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @ICU_RULE@
 @GRAPHITE2_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 2ea008b318a..7a38f36d396 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
+	* icu.test (new): Shell script for a basic test.
+	* icutest.c (new): Source code for test program.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/unicode/Makefile.am:
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index 107d30df3bd..1f014a3ad04 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -8,13 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: icubuild
-	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
-
-SUBDIRS = .
-
 ## We want to re-distribute the whole ICU source tree.
 EXTRA_DIST = $(ICU_TREE)
 
@@ -26,6 +19,8 @@ EXTRA_DIST += $(ICU_TREE)-PATCHES
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
+SUBDIRS = .
+
 if build
 all-local: icubuild
 SUBDIRS += include/unicode
@@ -63,6 +58,7 @@ if cross
 	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 endif cross
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 
 check-makeflags:
 	@for f in x $$MAKEFLAGS; do \
@@ -76,3 +72,25 @@ check-makeflags:
 distclean-local:
 	rm -rf icu-build icu-native
 
+if build
+check_PROGRAMS = icutest
+dist_check_SCRIPTS = icu.test
+TESTS = icu.test
+endif build
+
+icutest_SOURCES = icutest.c
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_icutest_SOURCES = dummy.cxx
+
+icutest_CPPFLAGS = -Iinclude
+
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = icubuild
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 9ebaf517a54..daa03d9f31f 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -78,9 +78,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @build_TRUE@am__append_1 = include/unicode
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog \
+@build_TRUE@check_PROGRAMS = icutest$(EXEEXT)
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+	$(top_srcdir)/../../build-aux/depcomp \
+	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/missing \
@@ -91,6 +94,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -102,6 +106,12 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am_icutest_OBJECTS = icutest-icutest.$(OBJEXT)
+icutest_OBJECTS = $(am_icutest_OBJECTS)
+icutest_LDADD = $(LDADD)
+icutest_DEPENDENCIES = icu-build/lib/libicuuc.a \
+	icu-build/lib/libicudata.a
+am__dist_check_SCRIPTS_DIST = icu.test
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -114,8 +124,41 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(icutest_SOURCES) $(nodist_EXTRA_icutest_SOURCES)
+DIST_SOURCES = $(icutest_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -136,7 +179,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope check recheck distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -157,6 +200,207 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='[0;31m'; \
+    grn='[0;32m'; \
+    lgn='[1;32m'; \
+    blu='[1;34m'; \
+    mgn='[0;35m'; \
+    brg='[1m'; \
+    std='[m'; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
 DIST_SUBDIRS = . include/unicode
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -211,6 +455,9 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -246,11 +493,13 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -300,15 +549,29 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = . $(am__append_1)
 EXTRA_DIST = $(ICU_TREE) $(ICU_TREE)-PATCHES
+SUBDIRS = . $(am__append_1)
 @cross_TRUE@ICU_NATIVE = icu-native/config/icucross.mk
+@build_TRUE@dist_check_SCRIPTS = icu.test
+@build_TRUE@TESTS = icu.test
+icutest_SOURCES = icutest.c
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_icutest_SOURCES = dummy.cxx
+icutest_CPPFLAGS = -Iinclude
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = icubuild
+CLEANFILES = rebuild.stamp
 all: all-recursive
 
 .SUFFIXES:
+.SUFFIXES: .c .cxx .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -331,6 +594,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -341,6 +605,82 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
+clean-checkPROGRAMS:
+	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
+icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) $(EXTRA_icutest_DEPENDENCIES) 
+	@rm -f icutest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icutest-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icutest-icutest.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+icutest-icutest.o: icutest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT icutest-icutest.o -MD -MP -MF $(DEPDIR)/icutest-icutest.Tpo -c -o icutest-icutest.o `test -f 'icutest.c' || echo '$(srcdir)/'`icutest.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/icutest-icutest.Tpo $(DEPDIR)/icutest-icutest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='icutest.c' object='icutest-icutest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o icutest-icutest.o `test -f 'icutest.c' || echo '$(srcdir)/'`icutest.c
+
+icutest-icutest.obj: icutest.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT icutest-icutest.obj -MD -MP -MF $(DEPDIR)/icutest-icutest.Tpo -c -o icutest-icutest.obj `if test -f 'icutest.c'; then $(CYGPATH_W) 'icutest.c'; else $(CYGPATH_W) '$(srcdir)/icutest.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/icutest-icutest.Tpo $(DEPDIR)/icutest-icutest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='icutest.c' object='icutest-icutest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o icutest-icutest.obj `if test -f 'icutest.c'; then $(CYGPATH_W) 'icutest.c'; else $(CYGPATH_W) '$(srcdir)/icutest.c'; fi`
+
+.cxx.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+icutest-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT icutest-dummy.o -MD -MP -MF $(DEPDIR)/icutest-dummy.Tpo -c -o icutest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/icutest-dummy.Tpo $(DEPDIR)/icutest-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='dummy.cxx' object='icutest-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o icutest-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+icutest-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT icutest-dummy.obj -MD -MP -MF $(DEPDIR)/icutest-dummy.Tpo -c -o icutest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/icutest-dummy.Tpo $(DEPDIR)/icutest-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='dummy.cxx' object='icutest-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(icutest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o icutest-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
@@ -447,6 +787,162 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -638,6 +1134,9 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \
+	  $(dist_check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile all-local
 installdirs: installdirs-recursive
@@ -662,8 +1161,12 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -674,13 +1177,14 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-local \
-	distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-local distclean-tags
 
 dvi: dvi-recursive
 
@@ -725,12 +1229,13 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -742,29 +1247,26 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--refresh check check-am clean clean-cscope clean-generic \
-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	am--refresh check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-cscope clean-generic cscope \
+	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-local \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
-
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-local distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am
 
-# Rebuild
-.PHONY: rebuild
-rebuild: icubuild
-	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 
 # in case of an SVN repository
 dist-hook:
@@ -797,6 +1299,7 @@ icu-native/Makefile:
 icubuild: icu-build/Makefile check-makeflags
 @cross_TRUE@	cd icu-native && $(MAKE) $(AM_MAKEFLAGS) all
 	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+	cd include/unicode && $(MAKE) $(AM_MAKEFLAGS) all
 
 check-makeflags:
 	@for f in x $$MAKEFLAGS; do \
@@ -809,6 +1312,27 @@ check-makeflags:
 
 distclean-local:
 	rm -rf icu-build icu-native
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index 5676918ff46..a126e183f97 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -594,6 +594,13 @@ icu_build_args
 icu_config
 ICU_TREE
 LN_S
+WARNING_CXXFLAGS
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
 cross_FALSE
 cross_TRUE
 build_FALSE
@@ -707,7 +714,10 @@ CC
 CFLAGS
 LDFLAGS
 LIBS
-CPPFLAGS'
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC'
 
 
 # Initialize some variables set by options.
@@ -1347,6 +1357,8 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1511,6 +1523,44 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -3733,6 +3783,437 @@ else
 fi
 
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5
+$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
+if ${kpse_cv_warning_cxxflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$GXX" = xyes; then
+  kpse_cv_warning_cxxflags=
+kpse_warn_strings="-Wno-write-strings"
+if test "x$enable_compiler_warnings" != xno; then
+  kpse_cv_warning_cxxflags="-Wreturn-type"
+  case `$CXX -dumpversion` in #(
+  3.* | 4.[012345].*) :
+    kpse_cv_warning_cxxflags="-Wimplicit $kpse_cv_warning_cxxflags" ;; #(
+  *) :
+     ;;
+esac
+  case `$CXX -dumpversion` in #(
+  3.[234].* | 4.*) :
+    kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
+  *) :
+     ;;
+esac
+  if test "x$enable_compiler_warnings" != xmin; then
+    kpse_cv_warning_cxxflags="-Wall -Wunused $kpse_cv_warning_cxxflags"
+    if test "x$enable_compiler_warnings" != xyes; then
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
+      kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wcast-qual -Wcast-align"
+      kpse_warn_strings="-Wwrite-strings"
+      if test "x$enable_compiler_warnings" != xmax; then
+        kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wshadow"
+      fi
+    fi
+  fi
+fi
+kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags $kpse_warn_strings"
+elif test "x$enable_compiler_warnings" = xno; then
+  kpse_cv_warning_cxxflags=
+else
+  kpse_cv_warning_cxxflags= # FIXME: warning flags for non-GNU C++ compilers
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_warning_cxxflags" >&5
+$as_echo "$kpse_cv_warning_cxxflags" >&6; }
+WARNING_CXXFLAGS=$kpse_cv_warning_cxxflags
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
@@ -3971,6 +4452,10 @@ if test -z "${cross_TRUE}" && test -z "${cross_FALSE}"; then
   as_fn_error $? "conditional \"cross\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index 357fcc688c7..b4eba9bf49c 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -21,6 +21,7 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
 
 AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
 
+AC_PROG_CXX
 AC_PROG_LN_S
 
 ICU_TREE=[icu-]icu_version
diff --git a/Build/source/libs/icu/include/unicode/Makefile.in b/Build/source/libs/icu/include/unicode/Makefile.in
index ee94a1df545..0da7962fb1f 100644
--- a/Build/source/libs/icu/include/unicode/Makefile.in
+++ b/Build/source/libs/icu/include/unicode/Makefile.in
@@ -121,6 +121,9 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -156,11 +159,13 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog
index 83677d2d471..e0a58ee9447 100644
--- a/Build/source/libs/libpng/ChangeLog
+++ b/Build/source/libs/libpng/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index be3ecfe7a24..3b07dfee01e 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -8,15 +8,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original libpng source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(LIBPNG_TREE).
 EXTRA_DIST = $(LIBPNG_TREE)
 
 ## Patches applied to the original source tree
@@ -60,15 +53,8 @@ nodist_libpng_a_SOURCES = \
 
 $(libpng_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force
-
-## Rebuild zlib
-@ZLIB_RULE@
-
+## Tests
+##
 TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
 if build
 TESTS = libpng.test
@@ -81,3 +67,18 @@ CLEANFILES = pngout.png
 nodist_pngtest_SOURCES = @LIBPNG_TREE@/pngtest.c
 pngtest_LDADD = libpng.a $(ZLIB_LIBS)
 
+## Rebuild zlib
+@ZLIB_RULE@
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+DISTCLEANFILES =
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index fe3f5bec838..279e98a56d6 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -77,10 +77,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 @build_TRUE@check_PROGRAMS = pngtest$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(am__dist_check_SCRIPTS_DIST) \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog README \
 	../../build-aux/compile ../../build-aux/config.guess \
@@ -91,6 +92,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -569,13 +571,20 @@ nodist_libpng_a_SOURCES = \
 	@LIBPNG_TREE@/pngerror.c \
 	@LIBPNG_TREE@/pngpread.c
 
-DISTCLEANFILES = config.force
 TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE)
 @build_TRUE@TESTS = libpng.test
 @build_TRUE@dist_check_SCRIPTS = libpng.test
-CLEANFILES = pngout.png
+CLEANFILES = pngout.png rebuild.stamp
 nodist_pngtest_SOURCES = @LIBPNG_TREE@/pngtest.c
 pngtest_LDADD = libpng.a $(ZLIB_LIBS)
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+DISTCLEANFILES = config.force
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -583,7 +592,7 @@ all: config.h
 .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -606,6 +615,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1315,10 +1325,6 @@ uninstall-am:
 	recheck tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
@@ -1332,11 +1338,40 @@ dist-hook:
 
 $(libpng_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @ZLIB_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog
index 96bc32a2fb8..6c17e1098e9 100644
--- a/Build/source/libs/lua52/ChangeLog
+++ b/Build/source/libs/lua52/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am
index 0ae09d41da3..a57333cbcc7 100644
--- a/Build/source/libs/lua52/Makefile.am
+++ b/Build/source/libs/lua52/Makefile.am
@@ -8,10 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original zlib source tree.
 ##
 EXTRA_DIST = $(LUA52_TREE)
@@ -66,3 +62,10 @@ nodist_liblua52_a_SOURCES = \
 	@LUA52_TREE@/src/lvm.c \
 	@LUA52_TREE@/src/lzio.c
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in
index 8313b2ae090..91dcd0e4959 100644
--- a/Build/source/libs/lua52/Makefile.in
+++ b/Build/source/libs/lua52/Makefile.in
@@ -76,11 +76,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
-	ChangeLog ../../build-aux/compile ../../build-aux/config.guess \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
+	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
@@ -88,6 +88,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-largefile.m4 \
@@ -396,6 +397,11 @@ nodist_liblua52_a_SOURCES = \
 	@LUA52_TREE@/src/lvm.c \
 	@LUA52_TREE@/src/lzio.c
 
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -403,7 +409,7 @@ all: config.h
 .SUFFIXES: .c .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -426,6 +432,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -908,6 +915,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1010,13 +1018,30 @@ uninstall-am:
 	tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog
index 3d8e6a95839..1b8fd8581e6 100644
--- a/Build/source/libs/pixman/ChangeLog
+++ b/Build/source/libs/pixman/ChangeLog
@@ -1,6 +1,6 @@
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* Makefile.am: Use ../am/rebuild.am.
+	* Makefile.am: Use ../../am/rebuild.am.
 
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in
index 6e5fa0fbcd8..00c6e9a85ee 100644
--- a/Build/source/libs/pixman/Makefile.in
+++ b/Build/source/libs/pixman/Makefile.in
@@ -1471,15 +1471,16 @@ rebuild: $(rebuild_prereq)
 	    *n*) dry=:;; \
 	  esac; \
 	done; \
-	$$dry rm -f rebuild.stamp; \
-	$$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
-	if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	  $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
-	  $$dry rmdir rebuild.lock; \
-	else \
-	  while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	fi; \
-	$$dry test -f rebuild.stamp
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/pixman/pixtest.c b/Build/source/libs/pixman/pixtest.c
index 4aeb0821fe9..f77fe27c9aa 100644
--- a/Build/source/libs/pixman/pixtest.c
+++ b/Build/source/libs/pixman/pixtest.c
@@ -9,6 +9,6 @@
 
 int main (int argc, char **argv)
 {
-  printf ("%s: using pixman %s\n", argv[0], pixman_version_string ());
+  printf ("%s: using pixman version %s\n", argv[0], pixman_version_string ());
   return 0;
 }
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 9cd67d519d5..5d46485a227 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am, include/{fofi,goo}/Makefile.am:
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index f5aae6c7bcd..e2fb830c3b1 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -8,10 +8,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original poppler source tree.
 ##
 EXTRA_DIST = $(POPPLER_TREE)
@@ -127,12 +123,19 @@ poppler_libpoppler_a_sources = \
 
 $(libpoppler_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force
-
 ## Rebuild zlib
 @ZLIB_RULE@
 
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+DISTCLEANFILES =
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index b6135a38875..04398daabb3 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -76,10 +76,10 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
 	$(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
@@ -90,6 +90,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -506,7 +507,15 @@ poppler_libpoppler_a_sources = \
 	@POPPLER_TREE@/poppler/XpdfPluginAPI.cc \
 	@POPPLER_TREE@/poppler/strtok_r.cpp
 
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
 DISTCLEANFILES = config.force
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h poppler-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -514,7 +523,7 @@ all: config.h poppler-config.h
 .SUFFIXES: .cc .cpp .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -537,6 +546,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1260,6 +1270,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1367,10 +1378,6 @@ uninstall-am:
 	tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
@@ -1379,11 +1386,40 @@ $(libpoppler_a_OBJECTS): $(ZLIB_DEPEND)
 
 $(libpoppler_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @ZLIB_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/potrace/ChangeLog b/Build/source/libs/potrace/ChangeLog
index 1d4397663f9..536f5dbe868 100644
--- a/Build/source/libs/potrace/ChangeLog
+++ b/Build/source/libs/potrace/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/potrace/Makefile.am b/Build/source/libs/potrace/Makefile.am
index f89a0f89b78..cabbcfa0ed1 100644
--- a/Build/source/libs/potrace/Makefile.am
+++ b/Build/source/libs/potrace/Makefile.am
@@ -8,15 +8,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original potrace source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(POTRACE_TREE).
 EXTRA_DIST = $(POTRACE_TREE)
 
 ## Changes applied to the original source tree
@@ -59,3 +52,10 @@ potracetst_CPPFLAGS = -Iinclude
 
 LDADD = libpotrace.a
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in
index a9c5ccc2347..f66e26bd43d 100644
--- a/Build/source/libs/potrace/Makefile.in
+++ b/Build/source/libs/potrace/Makefile.in
@@ -77,10 +77,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 @build_TRUE@check_PROGRAMS = potracetst$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(am__dist_check_SCRIPTS_DIST) \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
@@ -91,6 +91,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -559,6 +560,11 @@ libpotrace_a_SOURCES = \
 potracetst_SOURCES = potracetst.c
 potracetst_CPPFLAGS = -Iinclude
 LDADD = libpotrace.a
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -566,7 +572,7 @@ all: config.h
 .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -589,6 +595,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1175,6 +1182,7 @@ mostlyclean-generic:
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1279,13 +1287,30 @@ uninstall-am:
 	recheck tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog
index c2ca6e769a1..2f1855ede79 100644
--- a/Build/source/libs/teckit/ChangeLog
+++ b/Build/source/libs/teckit/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/teckit/Makefile.am:
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index 614c0b33234..a1935bcce03 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -5,15 +5,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original TECkit source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(TECKIT_TREE).
 EXTRA_DIST = $(TECKIT_TREE)
 
 ## Patches applied to the original source tree
@@ -55,14 +48,7 @@ nodist_libTECkit_a_SOURCES = \
 
 $(libTECkit_Compiler_a_OBJECTS) $(libTECkit_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force CXXLD.sh
-
-## Rebuild zlib
-@ZLIB_RULE@
+DISTCLEANFILES = CXXLD.sh
 
 ## Tests
 ##
@@ -79,3 +65,17 @@ EXTRA_DIST += \
 ##
 CLEANFILES = xtex-text.tec
 
+## Rebuild zlib
+@ZLIB_RULE@
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 4349585e8bc..df25d0e5fbd 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -80,10 +80,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = teckit_compile$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -95,6 +96,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
@@ -589,9 +591,16 @@ nodist_libTECkit_Compiler_a_SOURCES = \
 nodist_libTECkit_a_SOURCES = \
 	@TECKIT_TREE@/source/Engine.cpp
 
-DISTCLEANFILES = config.force CXXLD.sh
+DISTCLEANFILES = CXXLD.sh config.force
 @build_TRUE@TESTS = teckit.test
-CLEANFILES = xtex-text.tec
+CLEANFILES = xtex-text.tec rebuild.stamp
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -599,7 +608,7 @@ all: config.h
 .SUFFIXES: .cpp .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -622,6 +631,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1353,10 +1363,6 @@ uninstall-am: uninstall-binPROGRAMS
 	uninstall uninstall-am uninstall-binPROGRAMS
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
@@ -1365,11 +1371,40 @@ $(teckit_compile_OBJECTS): libTECkit_Compiler.a
 
 $(libTECkit_Compiler_a_OBJECTS) $(libTECkit_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
 @ZLIB_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog
index 95bd1dbd247..8ae901cb4a0 100644
--- a/Build/source/libs/xpdf/ChangeLog
+++ b/Build/source/libs/xpdf/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/{fofi,goo,splash,xpdf}/Makefile.am:
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 7493d0506ce..331c5dea141 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -19,15 +19,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original xpdf source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(XPDF_TREE).
 EXTRA_DIST = $(XPDF_TREE)
 
 ## Official patches as obtained from ftp://ftp.foolabs.com/pub/xpdf
@@ -116,3 +109,10 @@ xpdf_libxpdf_a_sources = \
 	@XPDF_TREE@/xpdf/UnicodeMap.cc \
 	@XPDF_TREE@/xpdf/XRef.cc
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 00754559864..2ec5c027aee 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -76,11 +76,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/aconf.h.in $(top_srcdir)/../../build-aux/depcomp \
-	ChangeLog ../../build-aux/compile ../../build-aux/config.guess \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/aconf.h.in \
+	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
+	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/missing \
 	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
@@ -88,6 +88,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -445,6 +446,11 @@ xpdf_libxpdf_a_sources = \
 	@XPDF_TREE@/xpdf/UnicodeMap.cc \
 	@XPDF_TREE@/xpdf/XRef.cc
 
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: aconf.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -452,7 +458,7 @@ all: aconf.h
 .SUFFIXES: .cc .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -475,6 +481,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1033,6 +1040,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1139,14 +1147,31 @@ uninstall-am:
 	tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
 	rm -f $(distdir)/$(XPDF_TREE)/install-sh
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index f56c393e9cb..82efbf35c34 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,6 +1,6 @@
 2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* Makefile.am: Use ../am/rebuild.am.
+	* Makefile.am: Use ../../am/rebuild.am.
 
 2012-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 47794e687af..b5f4b2bc37e 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -1365,15 +1365,16 @@ rebuild: $(rebuild_prereq)
 	    *n*) dry=:;; \
 	  esac; \
 	done; \
-	$$dry rm -f rebuild.stamp; \
-	$$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
-	if $$dry mkdir rebuild.lock 2>/dev/null; then \
-	  $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
-	  $$dry rmdir rebuild.lock; \
-	else \
-	  while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
-	fi; \
-	$$dry test -f rebuild.stamp
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog
index 181ce169459..b0597623504 100644
--- a/Build/source/libs/zziplib/ChangeLog
+++ b/Build/source/libs/zziplib/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* include/Makefile.am: Moved Makefile fragments to ../../am/.
diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am
index 52039a0d987..58cabc0dab9 100644
--- a/Build/source/libs/zziplib/Makefile.am
+++ b/Build/source/libs/zziplib/Makefile.am
@@ -8,15 +8,8 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 ## We want to re-distribute the whole original zziplib source tree.
 ##
-## With current automake (1.10.2) 'make distcheck' fails when
-## DISTFILES contains a directory and files in that directory.
-## Thus nodist_* for all files in $(ZZIPLIB_TREE).
 EXTRA_DIST = $(ZZIPLIB_TREE)
 
 ## Patches applied to the original source tree
@@ -52,14 +45,7 @@ nodist_libzzip_a_SOURCES = \
 
 $(libzzip_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
-
-DISTCLEANFILES = config.force include/_msvc.in _configs.sed
-
-## Rebuild zlib
-@ZLIB_RULE@
+DISTCLEANFILES = include/_msvc.in _configs.sed
 
 TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE)
 if build
@@ -74,3 +60,18 @@ distclean-local:
 nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c
 unzzip_LDADD = libzzip.a $(ZLIB_LIBS)
 
+## Rebuild zlib
+@ZLIB_RULE@
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+
+include $(srcdir)/../../am/reconfig.am
+
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in
index 81a92201f5d..76bea30d009 100644
--- a/Build/source/libs/zziplib/Makefile.in
+++ b/Build/source/libs/zziplib/Makefile.in
@@ -79,10 +79,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @build_TRUE@check_PROGRAMS = unzzip$(EXEEXT)
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(am__dist_check_SCRIPTS_DIST) \
+DIST_COMMON = $(srcdir)/../../am/reconfig.am \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in \
+	$(am__dist_check_SCRIPTS_DIST) \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog README \
 	../../build-aux/compile ../../build-aux/config.guess \
@@ -95,6 +96,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
 	$(top_srcdir)/m4/ax_prefix_config_h.m4 \
@@ -574,12 +576,20 @@ nodist_libzzip_a_SOURCES = \
 	@ZZIPLIB_TREE@/zzip/write.c \
 	@ZZIPLIB_TREE@/zzip/zip.c
 
-DISTCLEANFILES = config.force include/_msvc.in _configs.sed
+DISTCLEANFILES = include/_msvc.in _configs.sed config.force
 TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE)
 @build_TRUE@TESTS = zziplib.test
 @build_TRUE@dist_check_SCRIPTS = zziplib.test
 nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c
 unzzip_LDADD = libzzip.a $(ZLIB_LIBS)
+
+# Reconfig
+reconfig_prereq = $(ZLIB_DEPEND)
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -587,7 +597,7 @@ all: config.h
 .SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -610,6 +620,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1212,6 +1223,7 @@ mostlyclean-generic:
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1319,10 +1331,6 @@ uninstall-am:
 	ps ps-am recheck tags tags-am uninstall uninstall-am
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` \
@@ -1333,14 +1341,43 @@ dist-hook:
 
 $(libzzip_a_OBJECTS): config.force
 
-config.force: $(ZLIB_DEPEND)
-	echo timestamp >config.force
-	$(SHELL) ./config.status --recheck
+distclean-local:
+	rm -rf test
 
 @ZLIB_RULE@
+config.force: $(reconfig_prereq)
+	@if test -f $@; then :; else \
+	  trap 'rm -rf reconfig.lock' 1 2 13 15; \
+	  if mkdir reconfig.lock 2>/dev/null; then \
+	    echo timestamp >$@; \
+	    $(SHELL) ./config.status --recheck; \
+	    rmdir reconfig.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    test -f $@; \
+	  fi; \
+	fi
+rebuild.stamp:
+	echo timestamp >$@
 
-distclean-local:
-	rm -rf test
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index 66698ad2764..70efea2480c 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,6 +1,8 @@
 2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* am/*.am: Removed Makefile fragment to ../am/.
+	* am/*.am: Moved Makefile fragments to ../am/.
+
+	* Makefile.am, configure.ac: Use am/recurse.am.
 
 2013-03-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am
index 3529e918507..5ca4f2ab25a 100644
--- a/Build/source/texk/Makefile.am
+++ b/Build/source/texk/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am for the TeX Live subdirectory texk/
 ##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## Use 'aclocal --force' (for "computed m4_sinclude")
 ##
 ACLOCAL_AMFLAGS = -I ../m4 --force
 
-SUBDIRS = . $(SUBTEXK)
-DIST_SUBDIRS = $(DIST_SUBTEXK)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
@@ -19,49 +19,12 @@ cf_silent_1 =
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-CONFIG_AUX = ../subsubdir-conf.cmd
-
-all-local: subtexk
-
-.PHONY: subtexk
-# We must configure all texk subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-#
-# Sequentially configure and optionally build all texk programs;
-# code inspired by automake's way to handle recursive targets.
-subtexk: $(CONFIG_AUX)
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	list='$(DIST_SUBTEXK)'; for subtexk in $$list; do \
-	  if test ! -f $$subtexk/Makefile; then \
-	    test -d $$subtexk || $(MKDIR_P) $$subtexk; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,texk/$$subtexk,g"`; \
-	    case " $(SUBTEXK) " in \
-	      *" $$subtexk "*) skip=;; \
-	      *) skip=' --disable-build';; \
-	    esac; \
-	    (cd $$subtexk && echo "=== configuring in $$subtexk (`pwd`)" && \
-	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
-	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
-	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$subtexk failed"; exit 1; }) && \
-	    if test "x$$skip" = x; then \
-	      echo "Making all in $$subtexk" && \
-	      (cd $$subtexk && $(MAKE) $(AM_MAKEFLAGS) all); \
-	    fi || eval $$failcom; \
-	  fi; \
-	done; test -z "$$fail"
+## Configure and build subdirs.
+##
+recurse_this = texk/
+recurse_top = ../
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
-	exit 1
+include $(srcdir)/../am/recurse.am
 
 # Common infrastructure for tests
 EXTRA_DIST = tests
@@ -71,4 +34,4 @@ EXTRA_DIST = tests
 triptrap: web2c/Makefile
 	cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@
 web2c/Makefile:
-	$(MAKE) $(AM_MAKEFLAGS) DIST_SUBTEXK=web2c subtexk
+	$(MAKE) $(AM_MAKEFLAGS) CONF_SUBDIRS=web2c subtexk
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 6fe11d0a082..ebbdfb3e71b 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -77,18 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog README \
-	../build-aux/compile ../build-aux/config.guess \
-	../build-aux/config.sub ../build-aux/depcomp \
-	../build-aux/install-sh ../build-aux/missing \
-	../build-aux/texinfo.tex ../build-aux/ylwrap \
-	../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
+DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog README ../build-aux/compile \
+	../build-aux/config.guess ../build-aux/config.sub \
+	../build-aux/depcomp ../build-aux/install-sh \
+	../build-aux/missing ../build-aux/texinfo.tex \
+	../build-aux/ylwrap ../build-aux/ltmain.sh \
+	$(top_srcdir)/../build-aux/compile \
 	$(top_srcdir)/../build-aux/config.guess \
 	$(top_srcdir)/../build-aux/config.sub \
 	$(top_srcdir)/../build-aux/install-sh \
 	$(top_srcdir)/../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-common.m4 \
@@ -303,11 +304,11 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONF_SUBDIRS = @CONF_SUBDIRS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIST_SUBTEXK = @DIST_SUBTEXK@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -323,6 +324,7 @@ LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAKE_SUBDIRS = @MAKE_SUBDIRS@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -336,7 +338,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUBTEXK = @SUBTEXK@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 abs_builddir = @abs_builddir@
@@ -391,13 +392,21 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../m4 --force
-SUBDIRS = . $(SUBTEXK)
-DIST_SUBDIRS = $(DIST_SUBTEXK)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
 cf_silent_1 = 
-CONFIG_AUX = ../subsubdir-conf.cmd
+recurse_this = texk/
+recurse_top = ../
+
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+# Code inspired by automake's way to handle recursive targets.
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
 
 # Common infrastructure for tests
 EXTRA_DIST = tests
@@ -406,7 +415,7 @@ all: all-recursive
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -429,6 +438,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../am/recurse.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -861,17 +871,10 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-all-local: subtexk
+all-local: recurse
 
-.PHONY: subtexk
-# We must configure all texk subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-#
-# Sequentially configure and optionally build all texk programs;
-# code inspired by automake's way to handle recursive targets.
-subtexk: $(CONFIG_AUX)
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -879,28 +882,28 @@ subtexk: $(CONFIG_AUX)
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
-	list='$(DIST_SUBTEXK)'; for subtexk in $$list; do \
-	  if test ! -f $$subtexk/Makefile; then \
-	    test -d $$subtexk || $(MKDIR_P) $$subtexk; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,texk/$$subtexk,g"`; \
-	    case " $(SUBTEXK) " in \
-	      *" $$subtexk "*) skip=;; \
+	list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+	  if test ! -f $$one_dir/Makefile; then \
+	    test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+	    case " $(MAKE_SUBDIRS) " in \
+	      *" $$one_dir "*) skip=;; \
 	      *) skip=' --disable-build';; \
 	    esac; \
-	    (cd $$subtexk && echo "=== configuring in $$subtexk (`pwd`)" && \
+	    (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
 	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
 	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
 	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$subtexk failed"; exit 1; }) && \
+	        { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
 	    if test "x$$skip" = x; then \
-	      echo "Making all in $$subtexk" && \
-	      (cd $$subtexk && $(MAKE) $(AM_MAKEFLAGS) all); \
+	      echo "Making all in $$one_dir" && \
+	      (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
 	    fi || eval $$failcom; \
 	  fi; \
 	done; test -z "$$fail"
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
+$(CONFIG_AUX):
+	@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
 	exit 1
 
 # Special target to run TRIP and TRAP tests and create diffs.
@@ -908,7 +911,7 @@ subtexk: $(CONFIG_AUX)
 triptrap: web2c/Makefile
 	cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@
 web2c/Makefile:
-	$(MAKE) $(AM_MAKEFLAGS) DIST_SUBTEXK=web2c subtexk
+	$(MAKE) $(AM_MAKEFLAGS) CONF_SUBDIRS=web2c subtexk
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 697acbc3b2a..8ea76e76a56 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -590,8 +590,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-DIST_SUBTEXK
-SUBTEXK
+CONF_SUBDIRS
+MAKE_SUBDIRS
 subdirs
 WARNING_CFLAGS
 MAINT
@@ -6285,14 +6285,14 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
 $as_echo_n "checking for TeXk programs to build... " >&6; }
-SUBTEXK=
-DIST_SUBTEXK=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 
 
 
 if test -x $srcdir/web2c/configure; then
-  test "x$enable_web2c" = xno || SUBTEXK="$SUBTEXK web2c"
-  DIST_SUBTEXK="$DIST_SUBTEXK web2c"
+  test "x$enable_web2c" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
+  CONF_SUBDIRS="$CONF_SUBDIRS web2c"
   if false; then
     subdirs="$subdirs web2c"
 
@@ -6301,8 +6301,8 @@ fi
 
 
 if test -x $srcdir/afm2pl/configure; then
-  test "x$enable_afm2pl" = xno || SUBTEXK="$SUBTEXK afm2pl"
-  DIST_SUBTEXK="$DIST_SUBTEXK afm2pl"
+  test "x$enable_afm2pl" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+  CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
   if false; then
     subdirs="$subdirs afm2pl"
 
@@ -6311,8 +6311,8 @@ fi
 
 
 if test -x $srcdir/bibtex-x/configure; then
-  test "x$enable_bibtex_x" = xno || SUBTEXK="$SUBTEXK bibtex-x"
-  DIST_SUBTEXK="$DIST_SUBTEXK bibtex-x"
+  test "x$enable_bibtex_x" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
+  CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
   if false; then
     subdirs="$subdirs bibtex-x"
 
@@ -6321,8 +6321,8 @@ fi
 
 
 if test -x $srcdir/chktex/configure; then
-  test "x$enable_chktex" = xno || SUBTEXK="$SUBTEXK chktex"
-  DIST_SUBTEXK="$DIST_SUBTEXK chktex"
+  test "x$enable_chktex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+  CONF_SUBDIRS="$CONF_SUBDIRS chktex"
   if false; then
     subdirs="$subdirs chktex"
 
@@ -6331,8 +6331,8 @@ fi
 
 
 if test -x $srcdir/cjkutils/configure; then
-  test "x$enable_cjkutils" = xno || SUBTEXK="$SUBTEXK cjkutils"
-  DIST_SUBTEXK="$DIST_SUBTEXK cjkutils"
+  test "x$enable_cjkutils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
   if false; then
     subdirs="$subdirs cjkutils"
 
@@ -6341,8 +6341,8 @@ fi
 
 
 if test -x $srcdir/detex/configure; then
-  test "x$enable_detex" = xno || SUBTEXK="$SUBTEXK detex"
-  DIST_SUBTEXK="$DIST_SUBTEXK detex"
+  test "x$enable_detex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+  CONF_SUBDIRS="$CONF_SUBDIRS detex"
   if false; then
     subdirs="$subdirs detex"
 
@@ -6351,8 +6351,8 @@ fi
 
 
 if test -x $srcdir/devnag/configure; then
-  test "x$enable_devnag" = xno || SUBTEXK="$SUBTEXK devnag"
-  DIST_SUBTEXK="$DIST_SUBTEXK devnag"
+  test "x$enable_devnag" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+  CONF_SUBDIRS="$CONF_SUBDIRS devnag"
   if false; then
     subdirs="$subdirs devnag"
 
@@ -6361,8 +6361,8 @@ fi
 
 
 if test -x $srcdir/dtl/configure; then
-  test "x$enable_dtl" = xno || SUBTEXK="$SUBTEXK dtl"
-  DIST_SUBTEXK="$DIST_SUBTEXK dtl"
+  test "x$enable_dtl" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+  CONF_SUBDIRS="$CONF_SUBDIRS dtl"
   if false; then
     subdirs="$subdirs dtl"
 
@@ -6371,8 +6371,8 @@ fi
 
 
 if test -x $srcdir/dvi2tty/configure; then
-  test "x$enable_dvi2tty" = xno || SUBTEXK="$SUBTEXK dvi2tty"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvi2tty"
+  test "x$enable_dvi2tty" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
   if false; then
     subdirs="$subdirs dvi2tty"
 
@@ -6381,8 +6381,8 @@ fi
 
 
 if test -x $srcdir/dvidvi/configure; then
-  test "x$enable_dvidvi" = xno || SUBTEXK="$SUBTEXK dvidvi"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvidvi"
+  test "x$enable_dvidvi" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
   if false; then
     subdirs="$subdirs dvidvi"
 
@@ -6391,8 +6391,8 @@ fi
 
 
 if test -x $srcdir/dviljk/configure; then
-  test "x$enable_dviljk" = xno || SUBTEXK="$SUBTEXK dviljk"
-  DIST_SUBTEXK="$DIST_SUBTEXK dviljk"
+  test "x$enable_dviljk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
   if false; then
     subdirs="$subdirs dviljk"
 
@@ -6401,8 +6401,8 @@ fi
 
 
 if test -x $srcdir/dvipdfm-x/configure; then
-  test "x$enable_dvipdfm_x" = xno || SUBTEXK="$SUBTEXK dvipdfm-x"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvipdfm-x"
+  test "x$enable_dvipdfm_x" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
   if false; then
     subdirs="$subdirs dvipdfm-x"
 
@@ -6411,8 +6411,8 @@ fi
 
 
 if test -x $srcdir/dvipng/configure; then
-  test "x$enable_dvipng" = xno || SUBTEXK="$SUBTEXK dvipng"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvipng"
+  test "x$enable_dvipng" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
   if false; then
     subdirs="$subdirs dvipng"
 
@@ -6421,8 +6421,8 @@ fi
 
 
 if test -x $srcdir/dvipos/configure; then
-  test "x$enable_dvipos" = xno || SUBTEXK="$SUBTEXK dvipos"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvipos"
+  test "x$enable_dvipos" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
   if false; then
     subdirs="$subdirs dvipos"
 
@@ -6431,8 +6431,8 @@ fi
 
 
 if test -x $srcdir/dvipsk/configure; then
-  test "x$enable_dvipsk" = xno || SUBTEXK="$SUBTEXK dvipsk"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvipsk"
+  test "x$enable_dvipsk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
   if false; then
     subdirs="$subdirs dvipsk"
 
@@ -6441,8 +6441,8 @@ fi
 
 
 if test -x $srcdir/dvisvgm/configure; then
-  test "x$enable_dvisvgm" = xno || SUBTEXK="$SUBTEXK dvisvgm"
-  DIST_SUBTEXK="$DIST_SUBTEXK dvisvgm"
+  test "x$enable_dvisvgm" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+  CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
   if false; then
     subdirs="$subdirs dvisvgm"
 
@@ -6451,8 +6451,8 @@ fi
 
 
 if test -x $srcdir/gsftopk/configure; then
-  test "x$enable_gsftopk" = xno || SUBTEXK="$SUBTEXK gsftopk"
-  DIST_SUBTEXK="$DIST_SUBTEXK gsftopk"
+  test "x$enable_gsftopk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+  CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
   if false; then
     subdirs="$subdirs gsftopk"
 
@@ -6461,8 +6461,8 @@ fi
 
 
 if test -x $srcdir/lacheck/configure; then
-  test "x$enable_lacheck" = xno || SUBTEXK="$SUBTEXK lacheck"
-  DIST_SUBTEXK="$DIST_SUBTEXK lacheck"
+  test "x$enable_lacheck" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+  CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
   if false; then
     subdirs="$subdirs lacheck"
 
@@ -6471,8 +6471,8 @@ fi
 
 
 if test -x $srcdir/lcdf-typetools/configure; then
-  test "x$enable_lcdf_typetools" = xno || SUBTEXK="$SUBTEXK lcdf-typetools"
-  DIST_SUBTEXK="$DIST_SUBTEXK lcdf-typetools"
+  test "x$enable_lcdf_typetools" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
+  CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
   if false; then
     subdirs="$subdirs lcdf-typetools"
 
@@ -6481,8 +6481,8 @@ fi
 
 
 if test -x $srcdir/makeindexk/configure; then
-  test "x$enable_makeindexk" = xno || SUBTEXK="$SUBTEXK makeindexk"
-  DIST_SUBTEXK="$DIST_SUBTEXK makeindexk"
+  test "x$enable_makeindexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
   if false; then
     subdirs="$subdirs makeindexk"
 
@@ -6491,8 +6491,8 @@ fi
 
 
 if test -x $srcdir/makejvf/configure; then
-  test "x$enable_makejvf" = xno || SUBTEXK="$SUBTEXK makejvf"
-  DIST_SUBTEXK="$DIST_SUBTEXK makejvf"
+  test "x$enable_makejvf" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+  CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
   if false; then
     subdirs="$subdirs makejvf"
 
@@ -6501,8 +6501,8 @@ fi
 
 
 if test -x $srcdir/mendexk/configure; then
-  test "x$enable_mendexk" = xno || SUBTEXK="$SUBTEXK mendexk"
-  DIST_SUBTEXK="$DIST_SUBTEXK mendexk"
+  test "x$enable_mendexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
   if false; then
     subdirs="$subdirs mendexk"
 
@@ -6511,8 +6511,8 @@ fi
 
 
 if test -x $srcdir/ps2pkm/configure; then
-  test "x$enable_ps2pkm" = xno || SUBTEXK="$SUBTEXK ps2pkm"
-  DIST_SUBTEXK="$DIST_SUBTEXK ps2pkm"
+  test "x$enable_ps2pkm" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pkm"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2pkm"
   if false; then
     subdirs="$subdirs ps2pkm"
 
@@ -6521,8 +6521,8 @@ fi
 
 
 if test -x $srcdir/seetexk/configure; then
-  test "x$enable_seetexk" = xno || SUBTEXK="$SUBTEXK seetexk"
-  DIST_SUBTEXK="$DIST_SUBTEXK seetexk"
+  test "x$enable_seetexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+  CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
   if false; then
     subdirs="$subdirs seetexk"
 
@@ -6531,8 +6531,8 @@ fi
 
 
 if test -x $srcdir/tex4htk/configure; then
-  test "x$enable_tex4htk" = xno || SUBTEXK="$SUBTEXK tex4htk"
-  DIST_SUBTEXK="$DIST_SUBTEXK tex4htk"
+  test "x$enable_tex4htk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+  CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
   if false; then
     subdirs="$subdirs tex4htk"
 
@@ -6541,8 +6541,8 @@ fi
 
 
 if test -x $srcdir/ttf2pk/configure; then
-  test "x$enable_ttf2pk" = xno || SUBTEXK="$SUBTEXK ttf2pk"
-  DIST_SUBTEXK="$DIST_SUBTEXK ttf2pk"
+  test "x$enable_ttf2pk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk"
   if false; then
     subdirs="$subdirs ttf2pk"
 
@@ -6551,8 +6551,8 @@ fi
 
 
 if test -x $srcdir/ttf2pk2/configure; then
-  test "x$enable_ttf2pk2" = xno || SUBTEXK="$SUBTEXK ttf2pk2"
-  DIST_SUBTEXK="$DIST_SUBTEXK ttf2pk2"
+  test "x$enable_ttf2pk2" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
   if false; then
     subdirs="$subdirs ttf2pk2"
 
@@ -6561,8 +6561,8 @@ fi
 
 
 if test -x $srcdir/ttfdump/configure; then
-  test "x$enable_ttfdump" = xno || SUBTEXK="$SUBTEXK ttfdump"
-  DIST_SUBTEXK="$DIST_SUBTEXK ttfdump"
+  test "x$enable_ttfdump" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+  CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
   if false; then
     subdirs="$subdirs ttfdump"
 
@@ -6571,8 +6571,8 @@ fi
 
 
 if test -x $srcdir/xdvik/configure; then
-  test "x$enable_xdvik" = xno || SUBTEXK="$SUBTEXK xdvik"
-  DIST_SUBTEXK="$DIST_SUBTEXK xdvik"
+  test "x$enable_xdvik" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+  CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
   if false; then
     subdirs="$subdirs xdvik"
 
@@ -6581,8 +6581,8 @@ fi
 
 
 if test -x $srcdir/texlive/configure; then
-  test "x$enable_texlive" = xno || SUBTEXK="$SUBTEXK texlive"
-  DIST_SUBTEXK="$DIST_SUBTEXK texlive"
+  test "x$enable_texlive" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
+  CONF_SUBDIRS="$CONF_SUBDIRS texlive"
   if false; then
     subdirs="$subdirs texlive"
 
@@ -6592,8 +6592,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUBTEXK" >&5
-$as_echo "$SUBTEXK" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
+$as_echo "$MAKE_SUBDIRS" >&6; }
 
 ac_config_files="$ac_config_files Makefile"
 
diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac
index 450bd9dbb11..58ccbac524d 100644
--- a/Build/source/texk/configure.ac
+++ b/Build/source/texk/configure.ac
@@ -21,22 +21,22 @@ KPSE_BASIC([texk])
 AC_PROG_MKDIR_P
 
 AC_MSG_CHECKING([for TeXk programs to build])
-SUBTEXK=
-DIST_SUBTEXK=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 KPSE_FOR_PKGS([texk], [
 if test -x $srcdir/Kpse_Pkg/configure; then
-  test "x$enable_[]Kpse_pkg" = xno || SUBTEXK="$SUBTEXK Kpse_Pkg"
+  test "x$enable_[]Kpse_pkg" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS Kpse_Pkg"
 dnl Cause 'make dist' to recurse into all subtexk dirs
-  DIST_SUBTEXK="$DIST_SUBTEXK Kpse_Pkg"
+  CONF_SUBDIRS="$CONF_SUBDIRS Kpse_Pkg"
 dnl Cause 'configure -hr' and 'autoreconf' to recurse into all subtexk dirs
   if false; then
     AC_CONFIG_SUBDIRS(Kpse_Pkg)
   fi
 fi
 ])
-AC_SUBST([SUBTEXK])
-AC_SUBST([DIST_SUBTEXK])
-AC_MSG_RESULT([$SUBTEXK])
+AC_SUBST([MAKE_SUBDIRS])
+AC_SUBST([CONF_SUBDIRS])
+AC_MSG_RESULT([$MAKE_SUBDIRS])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ad29e87dce4..2214f6a374d 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -4,6 +4,10 @@
 	in path names to the cases CP936 (simplified Chinese) and CP950
 	(traditional Chinese) on Windows system.
 
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, man/Makefile.am:
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 37b104c2c7a..029fe0cd950 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -5,11 +5,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all-am
-	touch libkpathsea.la
-
 SUBDIRS = . doc man
 
 EXTRA_DIST = BUGS PROJECTS
@@ -211,13 +206,25 @@ stamp-paths: texmf.cnf bsnl.awk cnf-to-paths.awk
 	rm -f paths.tmp
 	date >$@
 
-kpathsea.h: Makefile paths.h
+## Similarly we don't want to rewrite kpathsea.h when only Makefile has
+## been remade but kpathsea.h remains the same.
+##
+kpathsea.h: stamp-kpathsea
+stamp-kpathsea: Makefile paths.h
 	$(AM_V_GEN)rm -f $@; \
 	( echo '/* This is a generated file */'; \
 	  echo '/* collecting all public kpathsea headers. */'; \
 	  for f in config.h c-auto.h paths.h $(normal_headers); do \
 	    echo "#include <kpathsea/$$f>"; \
-	  done ) >$@
+	  done ) >kpathsea.tmp
+	@if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
+	  echo "kpathsea.h is unchanged"; \
+	else \
+	  echo "cp kpathsea.tmp kpathsea.h"; \
+	  cp kpathsea.tmp kpathsea.h; \
+	fi
+	rm -f kpathsea.tmp
+	date >$@
 
 EXTRA_DIST += bsnl.awk cnf-to-paths.awk
 
@@ -300,6 +307,13 @@ TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
 TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
 EXTRA_DIST += $(TESTS)
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all-am
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
 ## Not used
 ##
 EXTRA_DIST += mktex.cnf
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 3c11138aa7c..c09f2746234 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -107,14 +107,14 @@ bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \
 	kpsestat$(EXEEXT) kpsewhich$(EXEEXT)
 EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
 DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/c-auto.in strcasecmp.c strstr.c putenv.c strtol.c \
-	$(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
-	$(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \
-	$(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
-	$(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
-	NEWS README ../../build-aux/compile \
+	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \
+	strstr.c putenv.c strtol.c $(dist_noinst_SCRIPTS) \
+	$(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \
+	$(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \
+	$(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \
+	AUTHORS ChangeLog NEWS README ../../build-aux/compile \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/missing ../../build-aux/texinfo.tex \
@@ -783,6 +783,11 @@ dist_noinst_DATA = texmf.cnf
 bin_links = mktexlsr:texhash
 TESTS = kpseaccess.test kpsereadlink.test kpsestat.test kpsewhich.test
 TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)'
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all-am
+CLEANFILES = rebuild.stamp
 all: $(BUILT_SOURCES) c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -790,7 +795,7 @@ all: $(BUILT_SOURCES) c-auto.h
 .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -813,7 +818,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/../../am/bin_links.am:
+$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -2064,6 +2069,7 @@ mostlyclean-generic:
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -2186,11 +2192,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
 	uninstall-local uninstall-nodist_kpseincludeHEADERS
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all-am
-	touch libkpathsea.la
-
 $(libkpathsea_la_OBJECTS): paths.h kpathsea.h
 
 paths.h: stamp-paths
@@ -2213,13 +2214,22 @@ stamp-paths: texmf.cnf bsnl.awk cnf-to-paths.awk
 	rm -f paths.tmp
 	date >$@
 
-kpathsea.h: Makefile paths.h
+kpathsea.h: stamp-kpathsea
+stamp-kpathsea: Makefile paths.h
 	$(AM_V_GEN)rm -f $@; \
 	( echo '/* This is a generated file */'; \
 	  echo '/* collecting all public kpathsea headers. */'; \
 	  for f in config.h c-auto.h paths.h $(normal_headers); do \
 	    echo "#include <kpathsea/$$f>"; \
-	  done ) >$@
+	  done ) >kpathsea.tmp
+	@if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
+	  echo "kpathsea.h is unchanged"; \
+	else \
+	  echo "cp kpathsea.tmp kpathsea.h"; \
+	  cp kpathsea.tmp kpathsea.h; \
+	fi
+	rm -f kpathsea.tmp
+	date >$@
 
 install-exec-local: installdirs-am
 @WIN32_FALSE@	@for f in $(dist_noinst_SCRIPTS); do \
@@ -2273,6 +2283,27 @@ uninstall-bin-links:
 install-exec-hook: install-bin-links
 
 uninstall-hook: uninstall-bin-links
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog
index 41550559b74..eba077e7b40 100644
--- a/Build/source/texk/ptexenc/ChangeLog
+++ b/Build/source/texk/ptexenc/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/rebuild.am.
+
 2013-06-29  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* ptexenc.c: Provide right console output on windows for both
diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am
index 5df40e02949..c017b5ab399 100644
--- a/Build/source/texk/ptexenc/Makefile.am
+++ b/Build/source/texk/ptexenc/Makefile.am
@@ -5,10 +5,6 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
@@ -42,3 +38,10 @@ nobase_include_HEADERS = \
 
 EXTRA_DIST = COPYRIGHT ChangeLog.jp
 
+# Rebuild
+rebuild_prereq =
+rebuild_target = all
+CLEANFILES =
+
+include $(srcdir)/../../am/rebuild.am
+
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index 3ed292a4ca7..43017e38390 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -79,10 +79,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/c-auto.in $(top_srcdir)/../../build-aux/depcomp \
+DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/c-auto.in \
+	$(top_srcdir)/../../build-aux/depcomp \
 	$(nobase_include_HEADERS) ChangeLog README \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -95,6 +95,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -383,13 +384,18 @@ nobase_include_HEADERS = \
 	ptexenc/unicode.h
 
 EXTRA_DIST = COPYRIGHT ChangeLog.jp
+
+# Rebuild
+rebuild_prereq = 
+rebuild_target = all
+CLEANFILES = rebuild.stamp
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -412,6 +418,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../../am/rebuild.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -821,6 +828,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -925,13 +933,30 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
 	uninstall-nobase_includeHEADERS
 
 
-# Rebuild
-.PHONY: rebuild
-rebuild: all
-
 $(libptexenc_la_OBJECTS): $(KPATHSEA_DEPEND)
 
 @KPATHSEA_RULE@
+rebuild.stamp:
+	echo timestamp >$@
+
+.PHONY: rebuild
+rebuild: $(rebuild_prereq)
+	@dry=; for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=*|--*);; \
+	    *n*) dry=:;; \
+	  esac; \
+	done; \
+	if test -f rebuild.stamp; then :; else \
+	  $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \
+	  if $$dry mkdir rebuild.lock 2>/dev/null; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \
+	    $$dry rmdir rebuild.lock; \
+	  else \
+	    while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \
+	    $$dry test -f rebuild.stamp; exit $$?; \
+	  fi; \
+	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/utils/ChangeLog b/Build/source/utils/ChangeLog
index 137b263ebfd..b148d250a12 100644
--- a/Build/source/utils/ChangeLog
+++ b/Build/source/utils/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac: Use am/recurse.am.
+
 2012-12-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_BASIC to enable silent rules.
diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am
index 6722cf7cd91..dd59231fc64 100644
--- a/Build/source/utils/Makefile.am
+++ b/Build/source/utils/Makefile.am
@@ -1,14 +1,14 @@
 ## Makefile.am for the TeX Live subdirectory utils/
 ##
-## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## Use 'aclocal --force' (for "computed m4_sinclude")
 ##
 ACLOCAL_AMFLAGS = -I ../m4 --force
 
-SUBDIRS = . $(SUBUTILS)
-DIST_SUBDIRS = $(DIST_SUBUTILS)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
@@ -19,47 +19,10 @@ cf_silent_1 =
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-CONFIG_AUX = ../subsubdir-conf.cmd
-
-all-local: subutils
-
-.PHONY: subutils
-# We must configure all utils subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-#
-# Sequentially configure and optionally build all utils subdirs;
-# code inspired by automake's way to handle recursive targets.
-subutils: $(CONFIG_AUX)
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	list='$(DIST_SUBUTILS)'; for subutils in $$list; do \
-	  if test ! -f $$subutils/Makefile; then \
-	    test -d $$subutils || $(MKDIR_P) $$subutils; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,utils/$$subutils,g"`; \
-	    case " $(SUBUTILS) " in \
-	      *" $$subutils "*) skip=;; \
-	      *) skip=' --disable-build';; \
-	    esac; \
-	    (cd $$subutils && echo "=== configuring in $$subutils (`pwd`)" && \
-	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
-	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
-	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$subutils failed"; exit 1; }) && \
-	    if test "x$$skip" = x; then \
-	      echo "Making all in $$subutils" && \
-	      (cd $$subutils && $(MAKE) $(AM_MAKEFLAGS) all); \
-	    fi || eval $$failcom; \
-	  fi; \
-	done; test -z "$$fail"
+## Configure and build subdirs.
+##
+recurse_this = utils/
+recurse_top = ../
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
-	exit 1
+include $(srcdir)/../am/recurse.am
 
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index cd90c7152bd..a8d09c645b9 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -77,18 +77,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) ChangeLog README \
-	../build-aux/compile ../build-aux/config.guess \
-	../build-aux/config.sub ../build-aux/depcomp \
-	../build-aux/install-sh ../build-aux/missing \
-	../build-aux/texinfo.tex ../build-aux/ylwrap \
-	../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
+DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) ChangeLog README ../build-aux/compile \
+	../build-aux/config.guess ../build-aux/config.sub \
+	../build-aux/depcomp ../build-aux/install-sh \
+	../build-aux/missing ../build-aux/texinfo.tex \
+	../build-aux/ylwrap ../build-aux/ltmain.sh \
+	$(top_srcdir)/../build-aux/compile \
 	$(top_srcdir)/../build-aux/config.guess \
 	$(top_srcdir)/../build-aux/config.sub \
 	$(top_srcdir)/../build-aux/install-sh \
 	$(top_srcdir)/../build-aux/missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-common.m4 \
@@ -303,11 +304,11 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CONF_SUBDIRS = @CONF_SUBDIRS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIST_SUBUTILS = @DIST_SUBUTILS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -323,6 +324,7 @@ LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MAKE_SUBDIRS = @MAKE_SUBDIRS@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -336,7 +338,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUBUTILS = @SUBUTILS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 abs_builddir = @abs_builddir@
@@ -391,19 +392,27 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../m4 --force
-SUBDIRS = . $(SUBUTILS)
-DIST_SUBDIRS = $(DIST_SUBUTILS)
+SUBDIRS = . $(MAKE_SUBDIRS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
 cf_silent = $(cf_silent_@AM_V@)
 cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
 cf_silent_0 = --silent
 cf_silent_1 = 
-CONFIG_AUX = ../subsubdir-conf.cmd
+recurse_this = utils/
+recurse_top = ../
+
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those not required for the current set of configure options
+# we append '--disable-build' so they can skip tests that would
+# fail because, e.g., some required libraries were not built.
+# Code inspired by automake's way to handle recursive targets.
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
 all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -426,6 +435,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/../am/recurse.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -858,17 +868,10 @@ uninstall-am:
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-all-local: subutils
+all-local: recurse
 
-.PHONY: subutils
-# We must configure all utils subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because, e.g., some required libraries were not built.
-#
-# Sequentially configure and optionally build all utils subdirs;
-# code inspired by automake's way to handle recursive targets.
-subutils: $(CONFIG_AUX)
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -876,28 +879,28 @@ subutils: $(CONFIG_AUX)
 	    *k*) failcom='fail=yes';; \
 	  esac; \
 	done; \
-	list='$(DIST_SUBUTILS)'; for subutils in $$list; do \
-	  if test ! -f $$subutils/Makefile; then \
-	    test -d $$subutils || $(MKDIR_P) $$subutils; \
-	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,utils/$$subutils,g"`; \
-	    case " $(SUBUTILS) " in \
-	      *" $$subutils "*) skip=;; \
+	list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+	  if test ! -f $$one_dir/Makefile; then \
+	    test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+	    cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+	    case " $(MAKE_SUBDIRS) " in \
+	      *" $$one_dir "*) skip=;; \
 	      *) skip=' --disable-build';; \
 	    esac; \
-	    (cd $$subutils && echo "=== configuring in $$subutils (`pwd`)" && \
+	    (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
 	      if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
 	      CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
 	      eval $(SHELL) $$cmd$$skip $(cf_silent) || \
-	        { echo "=== configuring in $$subutils failed"; exit 1; }) && \
+	        { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
 	    if test "x$$skip" = x; then \
-	      echo "Making all in $$subutils" && \
-	      (cd $$subutils && $(MAKE) $(AM_MAKEFLAGS) all); \
+	      echo "Making all in $$one_dir" && \
+	      (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
 	    fi || eval $$failcom; \
 	  fi; \
 	done; test -z "$$fail"
 
-../subsubdir-conf.cmd:
-	@echo "configure in ../auxdir/auxsub failed to create the file $@"
+$(CONFIG_AUX):
+	@echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
 	exit 1
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 827a8a32635..28bd2e567e3 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -590,8 +590,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-DIST_SUBUTILS
-SUBUTILS
+CONF_SUBDIRS
+MAKE_SUBDIRS
 subdirs
 WARNING_CFLAGS
 MAINT
@@ -6266,14 +6266,14 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Utils programs to build" >&5
 $as_echo_n "checking for Utils programs to build... " >&6; }
-SUBUTILS=
-DIST_SUBUTILS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 
 
 
 if test -x $srcdir/biber/configure; then
-  test "x$enable_biber" = xno || SUBUTILS="$SUBUTILS biber"
-  DIST_SUBUTILS="$DIST_SUBUTILS biber"
+  test "x$enable_biber" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS biber"
+  CONF_SUBDIRS="$CONF_SUBDIRS biber"
   if false; then
     subdirs="$subdirs biber"
 
@@ -6282,8 +6282,8 @@ fi
 
 
 if test -x $srcdir/m-tx/configure; then
-  test "x$enable_m_tx" = xno || SUBUTILS="$SUBUTILS m-tx"
-  DIST_SUBUTILS="$DIST_SUBUTILS m-tx"
+  test "x$enable_m_tx" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
+  CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
   if false; then
     subdirs="$subdirs m-tx"
 
@@ -6292,8 +6292,8 @@ fi
 
 
 if test -x $srcdir/pmx/configure; then
-  test "x$enable_pmx" = xno || SUBUTILS="$SUBUTILS pmx"
-  DIST_SUBUTILS="$DIST_SUBUTILS pmx"
+  test "x$enable_pmx" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
+  CONF_SUBDIRS="$CONF_SUBDIRS pmx"
   if false; then
     subdirs="$subdirs pmx"
 
@@ -6302,8 +6302,8 @@ fi
 
 
 if test -x $srcdir/ps2eps/configure; then
-  test "x$enable_ps2eps" = xno || SUBUTILS="$SUBUTILS ps2eps"
-  DIST_SUBUTILS="$DIST_SUBUTILS ps2eps"
+  test "x$enable_ps2eps" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
+  CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
   if false; then
     subdirs="$subdirs ps2eps"
 
@@ -6312,8 +6312,8 @@ fi
 
 
 if test -x $srcdir/psutils/configure; then
-  test "x$enable_psutils" = xno || SUBUTILS="$SUBUTILS psutils"
-  DIST_SUBUTILS="$DIST_SUBUTILS psutils"
+  test "x$enable_psutils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
+  CONF_SUBDIRS="$CONF_SUBDIRS psutils"
   if false; then
     subdirs="$subdirs psutils"
 
@@ -6322,8 +6322,8 @@ fi
 
 
 if test -x $srcdir/t1utils/configure; then
-  test "x$enable_t1utils" = xno || SUBUTILS="$SUBUTILS t1utils"
-  DIST_SUBUTILS="$DIST_SUBUTILS t1utils"
+  test "x$enable_t1utils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
+  CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
   if false; then
     subdirs="$subdirs t1utils"
 
@@ -6332,8 +6332,8 @@ fi
 
 
 if test -x $srcdir/texdoctk/configure; then
-  test "x$enable_texdoctk" = xno || SUBUTILS="$SUBUTILS texdoctk"
-  DIST_SUBUTILS="$DIST_SUBUTILS texdoctk"
+  test "x$enable_texdoctk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
+  CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
   if false; then
     subdirs="$subdirs texdoctk"
 
@@ -6342,8 +6342,8 @@ fi
 
 
 if test -x $srcdir/tpic2pdftex/configure; then
-  test "x$enable_tpic2pdftex" = xno || SUBUTILS="$SUBUTILS tpic2pdftex"
-  DIST_SUBUTILS="$DIST_SUBUTILS tpic2pdftex"
+  test "x$enable_tpic2pdftex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
+  CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
   if false; then
     subdirs="$subdirs tpic2pdftex"
 
@@ -6352,8 +6352,8 @@ fi
 
 
 if test -x $srcdir/vlna/configure; then
-  test "x$enable_vlna" = xno || SUBUTILS="$SUBUTILS vlna"
-  DIST_SUBUTILS="$DIST_SUBUTILS vlna"
+  test "x$enable_vlna" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
+  CONF_SUBDIRS="$CONF_SUBDIRS vlna"
   if false; then
     subdirs="$subdirs vlna"
 
@@ -6362,8 +6362,8 @@ fi
 
 
 if test -x $srcdir/xindy/configure; then
-  test "x$enable_xindy" = xno || SUBUTILS="$SUBUTILS xindy"
-  DIST_SUBUTILS="$DIST_SUBUTILS xindy"
+  test "x$enable_xindy" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
+  CONF_SUBDIRS="$CONF_SUBDIRS xindy"
   if false; then
     subdirs="$subdirs xindy"
 
@@ -6372,8 +6372,8 @@ fi
 
 
 if test -x $srcdir/xpdfopen/configure; then
-  test "x$enable_xpdfopen" = xno || SUBUTILS="$SUBUTILS xpdfopen"
-  DIST_SUBUTILS="$DIST_SUBUTILS xpdfopen"
+  test "x$enable_xpdfopen" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
+  CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
   if false; then
     subdirs="$subdirs xpdfopen"
 
@@ -6383,8 +6383,8 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUBUTILS" >&5
-$as_echo "$SUBUTILS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
+$as_echo "$MAKE_SUBDIRS" >&6; }
 
 ac_config_files="$ac_config_files Makefile"
 
diff --git a/Build/source/utils/configure.ac b/Build/source/utils/configure.ac
index 0af9e03ca1c..712041c6480 100644
--- a/Build/source/utils/configure.ac
+++ b/Build/source/utils/configure.ac
@@ -21,22 +21,22 @@ KPSE_BASIC([utils])
 AC_PROG_MKDIR_P
 
 AC_MSG_CHECKING([for Utils programs to build])
-SUBUTILS=
-DIST_SUBUTILS=
+MAKE_SUBDIRS=
+CONF_SUBDIRS=
 KPSE_FOR_PKGS([utils], [
 if test -x $srcdir/Kpse_Pkg/configure; then
-  test "x$enable_[]Kpse_pkg" = xno || SUBUTILS="$SUBUTILS Kpse_Pkg"
+  test "x$enable_[]Kpse_pkg" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS Kpse_Pkg"
 dnl Cause 'make dist' to recurse into all subutils dirs
-  DIST_SUBUTILS="$DIST_SUBUTILS Kpse_Pkg"
+  CONF_SUBDIRS="$CONF_SUBDIRS Kpse_Pkg"
 dnl Cause 'configure -hr' and 'autoreconf' to recurse into all subutils dirs
   if false; then
     AC_CONFIG_SUBDIRS(Kpse_Pkg)
   fi
 fi
 ])
-AC_SUBST([SUBUTILS])
-AC_SUBST([DIST_SUBUTILS])
-AC_MSG_RESULT([$SUBUTILS])
+AC_SUBST([MAKE_SUBDIRS])
+AC_SUBST([CONF_SUBDIRS])
+AC_MSG_RESULT([$MAKE_SUBDIRS])
 
 AC_CONFIG_FILES([Makefile])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2013-07-07 14:29:53 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2013-07-07 14:29:53 +0000
commit	0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch)
tree	e2f7056cb53c58c8ef5779450ac468091b2bd86d
parent	3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (diff)