Reimplement trunk 2011-05-24T08:02:58Z!rgm@gnu.org in a way visible to automake.

* configure.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES): New variable, passed to AC_CONFIG_FILES.
(SUBDIR_MAKEFILES_IN): New output variable.
* Makefile.in (OPT_MAKEFILES_IN): Remove.
(SUBDIR_MAKEFILES_IN): Let configure set it.

1 files changed, 1 insertions, 15 deletions

diff --git a/Makefile.in b/Makefile.in
index 67b09018b55..0c3eabcf3b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,22 +264,8 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 # checked out from a VCS.
 SUBDIR = lib lib-src src lisp
 
-# test/automated/Makefile.in, if you have it (test/ is not in the release).
-OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
-
 # The subdir makefiles created by config.status.
-SUBDIR_MAKEFILES_IN = $(srcdir)/lib/Makefile.in \
-  $(srcdir)/lib-src/Makefile.in \
-  $(srcdir)/doc/emacs/Makefile.in \
-  $(srcdir)/doc/misc/Makefile.in \
-  $(srcdir)/doc/lispref/Makefile.in \
-  $(srcdir)/doc/lispintro/Makefile.in \
-  $(srcdir)/src/Makefile.in \
-  $(srcdir)/oldXMenu/Makefile.in \
-  $(srcdir)/lwlib/Makefile.in \
-  $(srcdir)/leim/Makefile.in \
-  $(srcdir)/lisp/Makefile.in $(OPT_MAKEFILES_IN)
-
+SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
 SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 
 # Subdirectories to install, and where they'll go.