test/automated/Makefile.in remove stuff unnecessarily copied from lisp

* test/automated/Makefile.in (abs_top_srcdir): Remove variable.
(emacs): Use abs_srcdir rather than abs_top_srcdir.
(doit, compile, compile-always): Remove stuff copied from lisp/.
(all, check, bootstrap-clean, distclean, maintainer-clean): Declare PHONY.

Remove comments copied from lisp/.

2 files changed, 14 insertions, 49 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 23d5f4e048a..260a5bb72ff 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,14 +1,14 @@
 2013-11-02  Glenn Morris  <rgm@gnu.org>
 
         * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)
-        (test): Remove variables.
+        (test, abs_top_srcdir): Remove variables.
         (abs_srcdir): New, set by configure.
-        (emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc,
-        abs_test.
+        (emacs): Use abs_srcdir rather than abs_lispsrc, abs_test.
         (lisp-compile): Use ../../lisp rather than $lisp.
         (compile-main, compile-clean, compile-always, bootstrap-clean)
         (check): Use srcdir rather than $test.  Check cd return value.
-        (compile-always): Depend on bootstrap-clean.
+        (doit, compile, compile-always): Remove stuff copied from lisp/.
+        (all, check, bootstrap-clean, distclean, maintainer-clean): PHONY.
 
 2013-10-31  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index d729a08cb76..a84d8a7b349 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -21,7 +21,6 @@ SHELL = @SHELL@
 
 srcdir = @srcdir@
 abs_srcdir = @abs_srcdir@
-abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
 VPATH = $(srcdir)
 
@@ -34,17 +33,13 @@ VPATH = $(srcdir)
 EMACS = ${abs_top_builddir}/src/emacs
 
 # Command line flags for Emacs.
-
 EMACSOPT = -batch --no-site-file --no-site-lisp
 
-# Extra flags to pass to the byte compiler
+# Extra flags to pass to the byte compiler.
 BYTE_COMPILE_EXTRA_FLAGS =
-# For example to not display the undefined function warnings you can use this:
-# BYTE_COMPILE_EXTRA_FLAGS = --eval '(setq byte-compile-warnings (quote (not unresolved)))'
-# The example above is just for developers, it should not be used by default.
 
 # The actual Emacs command run in the targets below.
-emacs = EMACSLOADPATH="$(abs_top_srcdir)/lisp:$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
+emacs = EMACSLOADPATH="$(abs_srcdir)/../../lisp:$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=subdirs=`find . -type d -print`; \
@@ -54,42 +49,24 @@ setwins=subdirs=`find . -type d -print`; \
            esac; \
         done
 
-all: check
-
-doit:
+.PHONY: all check
 
+all: check
 
-# Files MUST be compiled one by one. If we compile several files in a
-# row (i.e., in the same instance of Emacs) we can't make sure that
-# the compilation environment is clean.  We also set the load-path of
-# the Emacs used for compilation to the current directory and its
-# subdirectories, to make sure require's and load's in the files being
-# compiled find the right files.
+# The compilation stuff is copied from lisp/Makefile - see comments there.
 
 .SUFFIXES: .elc .el
 
-# An old-fashioned suffix rule, which, according to the GNU Make manual,
-# cannot have prerequisites.
 .el.elc:
         @echo Compiling $<
         @$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
 
-.PHONY: lisp-compile compile-main compile compile-always
+
+.PHONY: lisp-compile compile-targets compile-main compile-clean
 
 lisp-compile:
         cd ../../lisp && $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
 
-# In `compile-main' we could directly do
-#    ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)"
-# and it works, but it generates a lot of messages like
-#    make[2]: « gnus/gnus-mlspl.elc » is up to date.
-# so instead, we use "xargs echo" to split the list of file into manageable
-# chunks and then use an intermediate `compile-targets' target so the
-# actual targets (the .elc files) are not mentioned as targets on the
-# make command line.
-
-
-.PHONY: compile-targets
 # TARGETS is set dynamically in the recursive call from `compile-main'.
 compile-targets: $(TARGETS)
 
@@ -107,7 +84,6 @@ compile-main: compile-clean lisp-compile
           $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
         done
 
-.PHONY: compile-clean
 # Erase left-over .elc files that do not have a corresponding .el file.
 compile-clean:
         @cd $(srcdir) && $(setwins); \
@@ -119,20 +95,8 @@ compile-clean:
           fi \
         done
 
-# Compile all Lisp files, but don't recompile those that are up to
-# date.  Some .el files don't get compiled because they set the
-# local variable no-byte-compile.
-# Calling make recursively because suffix rule cannot have prerequisites.
-# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
-# sub-makes that run rules that use it, for the sake of some non-GNU makes.
-compile: $(LOADDEFS) autoloads compile-first
-        $(MAKE) $(MFLAGS) compile-main EMACS="$(EMACS)"
-
-# Compile all Lisp files.  This is like `compile' but compiles files
-# unconditionally.  Some files don't actually get compiled because they
-# set the local variable no-byte-compile.
-compile-always: bootstrap-clean
-        $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
+
+.PHONY: bootstrap-clean distclean maintainer-clean
 
 bootstrap-clean:
         -cd $(srcdir) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
@@ -142,6 +106,7 @@ distclean:
 
 maintainer-clean: distclean bootstrap-clean
 
+
 check: compile-main
         @(cd $(srcdir) && $(setwins); \
         pattern=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \