[Emacs-diffs] trunk r114913: * automated/Makefile.in (test): Remove variable.

[Glenn Morris]

------------------------------------------------------------
revno: 114913
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 12:56:54 -0700
message:
  * automated/Makefile.in (test): Remove variable.
  (compile-main, compile-clean, compile-always, bootstrap-clean)
  (check): Use srcdir rather than $test.  Check cd return value.
  (compile-always): Depend on bootstrap-clean.
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 19:50:41 +0000
+++ b/test/ChangeLog    2013-11-02 19:56:54 +0000
@@ -1,10 +1,13 @@
 2013-11-02  Glenn Morris  <address@hidden>
 
-       * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
-       Remove variables.
+       * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)
+       (test): Remove variables.
        (emacs): Use abs_top_srcdir, 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.
 
 2013-10-31  Michael Albinus  <address@hidden>
 

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-02 19:50:41 +0000
+++ b/test/automated/Makefile.in        2013-11-02 19:56:54 +0000
@@ -22,7 +22,6 @@
 srcdir = @srcdir@
 abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
-test = $(srcdir)
 VPATH = $(srcdir)
 
 # You can specify a different executable on the make command line,
@@ -96,7 +95,7 @@
 # Compile all the Elisp files that need it.  Beware: it approximates
 # `no-byte-compile', so watch out for false-positives!
 compile-main: compile-clean lisp-compile
-       @(cd $(test); $(setwins); \
+       @(cd $(srcdir) && $(setwins); \
        els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el 
|g'`; \
        for el in $$els; do \
          test -f $$el || continue; \
@@ -110,7 +109,7 @@
 .PHONY: compile-clean
 # Erase left-over .elc files that do not have a corresponding .el file.
 compile-clean:
-       @cd $(test); $(setwins); \
+       @cd $(srcdir) && $(setwins); \
        elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| 
|/*.elc |g'`; \
        for el in $$(echo $$elcs | sed -e 's/\.elc/\.el/g'); do \
          if test -f "$$el" -o \! -f "$${el}c"; then :; else \
@@ -131,20 +130,19 @@
 # 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: doit
-       cd $(test); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
+compile-always: bootstrap-clean
        $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
 
 bootstrap-clean:
-       cd $(test); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
+       -cd $(srcdir) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
 
 distclean:
-       -rm -f ./Makefile
+       rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean
 
 check: compile-main
-       @(cd $(test); $(setwins); \
+       @(cd $(srcdir) && $(setwins); \
        pattern=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| 
|/*.el |g'`; \
        for el in $$pattern; do \
          test -f $$el || continue; \