summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-05-24 13:23:15 -0400
committerGlenn Morris <rgm@gnu.org>2011-05-24 13:23:15 -0400
commit70716b1dcadf62d61ce4b3f7279fac2aeae3bd55 (patch)
tree50eb92be67f39a6d88bfb30f9272b83b672c930a /Makefile.in
parent40e27e7f901e022e90f873e9b95ae8106a1a1bfa (diff)
downloademacs-70716b1dcadf62d61ce4b3f7279fac2aeae3bd55.tar.gz
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.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in16
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.