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

11 files changed, 243 insertions, 194 deletions

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.