[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.3-163-gc1b83e1

[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=c1b83e1af60b866cf5cdeebf77d0275019bad8b2

The branch, master has been updated
       via  c1b83e1af60b866cf5cdeebf77d0275019bad8b2 (commit)
       via  f25f4bfcc358152a619b246bf91aa8653eb6cadd (commit)
       via  9c4ad6973eedb074a9381e14a6c1eeeb285c2465 (commit)
       via  94b7b8ecd4bae85782b45a9bb36f42c4d2b93805 (commit)
      from  076e8fa284c2453099286876684be913512af381 (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 c1b83e1af60b866cf5cdeebf77d0275019bad8b2
Author: Stefano Lattarini <address@hidden>
Date:   Tue Sep 11 11:31:20 2012 +0200

    tags: automake bug bug#12372 is fixed
    
    It has been fixed as a side effect of the overhauling of tags support.
    
    * t/list-of-tests.mk (XFAIL_TESTS): No longer list 'tags-pr12372.sh'.
    * NEWS: Update.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f25f4bfcc358152a619b246bf91aa8653eb6cadd
Merge: 076e8fa 9c4ad69
Author: Stefano Lattarini <address@hidden>
Date:   Tue Sep 11 11:24:51 2012 +0200

    Merge branch 'maint'
    
    * maint:
      coverage: better exposure for automake bug#12372 (tags-related)
      coverage: expose automake bug#12372 (tags-related)

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

Summary of changes:
 NEWS                                       |    5 ++
 t/list-of-tests.mk                         |    1 +
 t/{recurs-user-many.sh => tags-pr12372.sh} |   67 ++++++++++++++--------------
 3 files changed, 40 insertions(+), 33 deletions(-)
 copy t/{recurs-user-many.sh => tags-pr12372.sh} (52%)

diff --git a/NEWS b/NEWS
index f243d8c..46aa8cd 100644
--- a/NEWS
+++ b/NEWS
@@ -127,10 +127,15 @@ New in 1.13:
     specifying the name of such targets in invocations of the new
     'AM_EXTRA_RECURSIVE_TARGETS' m4 macro.
 
+* Tags:
+
   - Any failure in the recipe of the "tags", "ctags", "cscope" or
     "cscopelist" targets in a subdirectory is now propagated to the
     top-level make invocation.
 
+  - Tags are correctly computed also for files in _SOURCES variables that
+    only list files with non-standard suffixes (see automake bug#12372).
+
 * Improvements to aclocal and related rebuilds rules:
 
   - The Autoconf-provided macro AC_CONFIG_MACRO_DIR is now traced by
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 57bc89b..3708ef7 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1155,6 +1155,7 @@ t/tap-summary-color.sh \
 t/tags.sh \
 t/tags2.sh \
 t/tagsub.sh \
+t/tags-pr12372.sh \
 t/tar.sh \
 t/tar2.sh \
 t/tar3.sh \
diff --git a/t/recurs-user-many.sh b/t/tags-pr12372.sh
similarity index 52%
copy from t/recurs-user-many.sh
copy to t/tags-pr12372.sh
index c1e4757..66b40a0 100755
--- a/t/recurs-user-many.sh
+++ b/t/tags-pr12372.sh
@@ -14,60 +14,61 @@
 # 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 many user-defined recursive targets can be supported
-# at once, and that calls to 'AM_EXTRA_RECURSIVE_TARGETS' are
-# cumulative.
+# Test to make sure tags are processed also for files with non-standard
+# extensions.  See automake bug#12372.
 
+required='cc etags'
 . ./defs || exit 1
 
 cat >> configure.ac <<'END'
+AC_PROG_CC
 AC_CONFIG_FILES([sub/Makefile])
-## NOTE: extra white spaces, tabs, newlines and backslashes in the
-## lines below: on purpose.
-AM_EXTRA_RECURSIVE_TARGETS([ foo  \
-       bar  ])
-AC_SUBST([CLEANFILES], ['foo bar baz'])
 AC_OUTPUT
-# Yes, this appears after AC_OUTPUT.  So what?
-AM_EXTRA_RECURSIVE_TARGETS([baz])
 END
 
-mkdir sub
-
 cat > Makefile.am <<'END'
+all-local: tags
+.pc.o:
+       sed -e 's/\[/{/' -e 's/\]/}/' $(srcdir)/$*.pc >$*.c
+       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
+       rm -f $*.c
+
+LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
+noinst_PROGRAMS = foo
+foo_SOURCES = foo-main.pc barbar.c
 SUBDIRS = sub
-foo-local:
-       : > foo
-bar-local:
-       echo x > bar
-baz-local: ; touch baz
-check-local: foo bar baz
-       ls -l . sub ;: For debugging.
-       test -f foo
-       test -f bar
-       test -f baz
-       test -f sub/foo
-       test -f sub/bar
-       test -f sub/baz
 END
 
+mkdir sub
 cat > sub/Makefile.am <<'END'
-foo-local bar-local baz-local:
-       touch `echo $@ | sed 's/-local$$//'`
+all-local: tags
+.pc.o:
+       sed -e 's/@/a/g' $(srcdir)/$*.pc >$*.c
+       $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $*.c
+       rm -f $*.c
+
+LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
+noinst_PROGRAMS = zap
+zap_SOURCES = zardoz.pc
 END
 
+echo 'int main(void) [ return bar(1); ]' > foo-main.pc
+echo 'int bar(int x) { return !x; }' > barbar.c
+echo 'int address@hidden(void) { return 0; }' > sub/zardoz.pc
+
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 
-for t in foo bar baz; do
-  $FGREP "$t-am" Makefile.in
-  $FGREP "$t-am" sub/Makefile.in
-done
-
 ./configure
 
-$MAKE check
+$MAKE
+cat TAGS
+cat sub/TAGS
+$FGREP foo-main.pc TAGS
+$FGREP barbar.c TAGS
+$FGREP zardoz.pc sub/TAGS
+
 $MAKE distcheck
 
 :


hooks/post-receive
-- 
GNU Automake