[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-90-gf480f1a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f480f1a7b9673f74b531c26b1ff5ea136a320b52

The branch, ng/master has been updated
       via  f480f1a7b9673f74b531c26b1ff5ea136a320b52 (commit)
       via  661337527c7bef0b794ce366e963b14c326ba1d5 (commit)
       via  d605ac1891ab238a493516dae32095ac9b1d70b5 (commit)
      from  d0eb9120eabaf7aa8f381b1fab712bd772c59785 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f480f1a7b9673f74b531c26b1ff5ea136a320b52
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 16 14:24:27 2012 +0200

    [ng] tests: better name for a test script
    
    * t/spy.sh: Rename ...
    * t/spy-double-colon.sh: ... to this.
    * t/list-of-tests.mk: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 661337527c7bef0b794ce366e963b14c326ba1d5
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 16 14:22:08 2012 +0200

    [ng] tests: add "spy" test for '.PHONY' support
    
    Some make implementations (especially Solaris make) have some problems
    in '.PHONY' support, and this has had the consequence that mainstream
    Automake hadn't been able to fully take advantage of the '.PHONY'
    semantics to simplify some of its idioms or recipes.  Since we now
    want to assume and take advantage of such semantics, we add a new "spy"
    test case verifying that they truly hold GNU make, to avoid unwelcome
    surprises.
    
    * t/spy-phony.sh: New test.
    * t/list-of-tests.mk: Add it.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit d605ac1891ab238a493516dae32095ac9b1d70b5
Author: Stefano Lattarini <address@hidden>
Date:   Mon Apr 16 13:34:35 2012 +0200

    [ng] build: simplify rules for ChangeLog generation
    
    The pre-existing rules used an hacky indirection, only to work
    around a Solaris make bug in '.PHONY' support.  GNU make does
    not suffer of this bug, so we can simplify our rules accordingly.
    
    * Makefile.am (am--changelog-regen-hook): Remove this dummy target.
    (.PHONY, ChangeLog): Do not depend on it.
    (.PHONY): Depend directly on 'ChangeLog' instead.
    Remove outdated comments.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                        |   11 +----
 t/list-of-tests.mk                                 |    3 +-
 t/{spy.sh => spy-double-colon.sh}                  |    0
 t/{aclocal-no-install-no-mkdir.sh => spy-phony.sh} |   46 ++++++++++++++------
 4 files changed, 36 insertions(+), 24 deletions(-)
 rename t/{spy.sh => spy-double-colon.sh} (100%)
 copy t/{aclocal-no-install-no-mkdir.sh => spy-phony.sh} (55%)

diff --git a/Makefile.am b/Makefile.am
index 6b5695c..8c29aee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -595,15 +595,8 @@ EXTRA_DIST += $(gitlog_to_changelog_fixes)
 # copy the distributed ChangeLog in the build directory (and if this
 # fails, or if no distributed ChangeLog file is present, complain and
 # give an error).
-#
-# We need the apparently useless dependency from another .PHONY target
-# 'am--changelog-regen-hook' to work around a bug of Solaris make, which
-# doesn't execute the recipe of a target named as an existing file, even
-# if such target is declared '.PHONY' (yikes!)
-#
-.PHONY: am--changelog-regen-hook
-am--changelog-regen-hook:
-ChangeLog: am--changelog-regen-hook
+.PHONY: ChangeLog
+ChangeLog:
        $(AM_V_GEN)set -e; set -u; \
 ## The ChangeLog should be regenerated unconditionally when working from
 ## checked-out sources; otherwise, if we're working from a distribution
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index dd2109e..30538e1 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -979,7 +979,8 @@ t/spell.sh \
 t/spell2.sh \
 t/spell3.sh \
 t/spelling.sh \
-t/spy.sh \
+t/spy-double-colon.sh \
+t/spy-phony.sh \
 t/spy-rm.tap \
 t/spy-vpath-rewrite.sh \
 t/stdinc.sh \
diff --git a/t/spy.sh b/t/spy-double-colon.sh
similarity index 100%
rename from t/spy.sh
rename to t/spy-double-colon.sh
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/spy-phony.sh
similarity index 55%
copy from t/aclocal-no-install-no-mkdir.sh
copy to t/spy-phony.sh
index 728e70a..4e42819 100755
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/spy-phony.sh
@@ -14,26 +14,44 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that aclocal does not create a non-existent local m4 directory
-# if the '--install' option is not given.
+# Check that the '.PHONY' semantics we expect truly hold.
 
 am_create_testdir=empty
 . ./defs || Exit 1
 
-set -e
-
-cat > configure.ac <<END
-AC_INIT([$me], [1.0])
-MY_MACRO
+cat > Makefile <<'END'
+.PHONY: pdir pfile
+pdir rdir:
+       echo foo > $@/foo
+pfile rfile:
+       echo bar >$@
+.PHONY: other
+other:
+       echo baz >> dummy
+indirect: other
+       echo run > $@
 END
 
-mkdir sys-acdir
-cat > sys-acdir/my-defs.m4 <<END
-AC_DEFUN([MY_MACRO], [:])
-END
+: > rfile
+mkdir rdir
+$MAKE rdir rfile
+test ! -s rfile
+test ! -f rdir/foo
+
+: > pfile
+mkdir pdir
+$MAKE pdir pfile
+test "`cat pfile`" = bar
+test "`cat pdir/foo`" = foo
+
+$MAKE other
+test "`cat dummy`" = baz
+$MAKE other
+test "`cat dummy`" = "baz${nl}baz"
 
-$ACLOCAL -I foo --system-acdir=sys-acdir && Exit 1
-test ! -d foo
-test ! -r foo
+echo not run > indirect
+$MAKE indirect
+test "`cat indirect`" = run
+test "`cat dummy`" = "baz${nl}baz${nl}baz"
 
 :


hooks/post-receive
-- 
GNU Automake