From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 1 Jun 2011 17:37:18 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~340
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2aa8c8e8829c255a20030cc8dd1e02e930d63698;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint'

* maint:
  remake: behave better with non-GNU make in subdirectories
---

2aa8c8e8829c255a20030cc8dd1e02e930d63698
diff --cc ChangeLog
index cb8adbc,fd1312e..5e82c6d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,21 +1,19 @@@
  2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	remake: behave better with non-GNU make in subdirectories
+ 	Currently, with every decent make program, it is possible to
+ 	rebuild out-of-date autotools-generated files with a simple
+ 	"make Makefile" -- but for this to work reliably with non-GNU
+ 	make implementations, the command must be issued from the
+ 	top-level directory.  This patch removes such limitation.
+ 	* lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
 -	* tests/defs.in (using_gmake): New function, backported from the
 -	`master' branch (and simplified).
+ 	* tests/remake-subdir.test: New test.
+ 	* tests/remake-subdir2.test: Likewise.
+ 	* tests/remake-subdir-gnu.test: Likewise.
+ 	* tests/remake-subdir-from-subdir.test: Likewise.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
+ 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  	Currently, the Automake's own configure script allow definition
diff --cc tests/Makefile.am
index d1a3cda,33ae8bc..e68f6d7
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -796,28 -654,12 +796,32 @@@ remake4.test 
  remake5.test \
  remake6.test \
  remake7.test \
 +remake8a.test \
 +remake8b.test \
 +remake9a.test \
 +remake9b.test \
 +remake9c.test \
 +remake9d.test \
 +remake10a.test \
 +remake10b.test \
 +remake10c.test \
 +remake11.test \
 +remake12.test \
+ remake-subdir-from-subdir.test \
+ remake-subdir-gnu.test \
+ remake-subdir.test \
+ remake-subdir2.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \
diff --cc tests/Makefile.in
index 44f8c97,d7a1761..7e5fd09
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1063,28 -925,12 +1063,32 @@@ remake4.test 
  remake5.test \
  remake6.test \
  remake7.test \
 +remake8a.test \
 +remake8b.test \
 +remake9a.test \
 +remake9b.test \
 +remake9c.test \
 +remake9d.test \
 +remake10a.test \
 +remake10b.test \
 +remake10c.test \
 +remake11.test \
 +remake12.test \
+ remake-subdir-from-subdir.test \
+ remake-subdir-gnu.test \
+ remake-subdir.test \
+ remake-subdir2.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \