[Emacs-diffs] trunk r114918: test/automated/Makefile.in remove stuff unnecessarily copied from lisp

[Glenn Morris]

------------------------------------------------------------
revno: 114918
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 13:32:22 -0700
message:
  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/.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-02 20:12:12 +0000
+++ b/test/ChangeLog    2013-11-02 20:32:22 +0000
@@ -1,14 +1,14 @@
 2013-11-02  Glenn Morris  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-02 20:12:12 +0000
+++ b/test/automated/Makefile.in        2013-11-02 20:32:22 +0000
@@ -21,7 +21,6 @@
 
 srcdir = @srcdir@
 abs_srcdir = @abs_srcdir@
-abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
 VPATH = $(srcdir)
 
@@ -34,17 +33,13 @@
 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 @@
           esac; \
         done
 
+.PHONY: all check
+
 all: check
 
-doit:
-
-
-# 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 @@
          $(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 @@
          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 @@
 
 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'`; \