[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-140-g2360b87

[Ralf Wildenhues]

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=2360b8785bfa80c1968193f6ab7137764c91572e

The branch, maint has been updated
       via  2360b8785bfa80c1968193f6ab7137764c91572e (commit)
       via  89e0334a031593d605b0b735e2150a1bc8ce4d6c (commit)
       via  5206e8917dd8eaf85d3e0bf484e9750359c43465 (commit)
       via  bd50d9c1b5b7057b0fb325d3505a0ae4d975258c (commit)
       via  fee7d0d34e5cd1145c1de58466062704183f61c9 (commit)
       via  65a2059a21fa318e048af43a7a6628d7c5fd39a5 (commit)
       via  3d461fdcefdb9fcb1d4cfafc0226906c00ff77a3 (commit)
      from  e8413c400ac63bdc65a05851d23c2f076dcdee48 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   47 ++++++++++++++++++++++++++++
 NEWS                    |    4 ++
 automake.in             |    8 ++--
 doc/automake.texi       |    8 ++--
 tests/Makefile.am       |    5 +++
 tests/Makefile.in       |    5 +++
 tests/distlinksbrk.test |   78 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/lflags.test       |   71 ++++++++++++++++++++++++++++++++++++++++++
 tests/lflags2.test      |   72 +++++++++++++++++++++++++++++++++++++++++++
 tests/silent5.test      |    4 +-
 tests/yflags.test       |   69 +++++++++++++++++++++++++++++++++++++++++
 tests/yflags2.test      |   70 ++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 431 insertions(+), 10 deletions(-)
 create mode 100755 tests/distlinksbrk.test
 create mode 100755 tests/lflags.test
 create mode 100755 tests/lflags2.test
 create mode 100755 tests/yflags.test
 create mode 100755 tests/yflags2.test

diff --git a/ChangeLog b/ChangeLog
index c05f61a..4bc154a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2010-06-24  Stefano Lattarini  <address@hidden>
+
+       Fix bugs in test script silent5.test.
+       * tests/silent5.test: Fixed a nasty bug (due to the use of grep
+       instead of egrep) that could have led to false negatives.
+
+2010-06-21  Stefano Lattarini  <address@hidden>
+
+       Add a test checking that distributed broken symlinks cause
+       `make dist' to fail.
+       * tests/distlinksbrk.test: New test.
+       * tests/Makefile.am (TESTS): Updated.
+
+2010-06-21  Ralf Wildenhues  <address@hidden>
+
+       Fix minor testsuite issues, update docs, for Yacc/Lex changes.
+       * doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
+       and AM_LFLAGS, LFLAGS in the order in which they now appear in
+       the rules.
+       * NEWS: Update.
+       * tests/lflags.test, tests/lflags2.test, tests/yflags.test,
+       tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
+       please maintainer-check.  Ensure generated C files contain a
+       declaration, to please compilers.
+
+2010-06-21  Stefano Lattarini  <address@hidden>
+
+       Fix bugs in Automake Yacc/Lex support w.r.t. $(AM_FLAGS) and
+       $(FLAGS) precedence.
+       * automake.in: Fix registration of languages "Lex", "Lex (C++)",
+       "Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
+       $(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
+       * tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
+       * NEWS: Updated.
+
+       New tests, exposing bugs in Automake Yacc/Lex support w.r.t.
+       $(AM_FLAGS) and $(FLAGS) precedence.
+       * tests/lflags.test: New test, check that user $(LFLAGS) takes
+       precedence over automake (AM_LFLAGS) and (foo_LFLAGS).  Still
+       xfailing.
+       * tests/lflags2.test: Likewise.
+       * tests/yflags.test: New test, check that user $(YFLAGS) takes
+       precedence over automake (AM_YFLAGS) and (foo_YFLAGS).  Still
+       xfailing.
+       * tests/yflags2.test: Likewise.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
+
 2010-06-20  Stefano Lattarini  <address@hidden>
 
        Modernize, improve and extend tests `suffix*.test'.
diff --git a/NEWS b/NEWS
index 5b6c056..b8a0f08 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,10 @@ Bugs fixed in 1.11.0a:
 
   - A per-Makefile.am setting of -Werror does not carry over to the
     handling of other Makefile.am files any more.
+
+  - The order of Yacc and Lex flags is fixed to be consistent with other
+    languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
+    $(LFLAGS), so that the user variables override the developer variables.
 
 New in 1.11:
 
diff --git a/automake.in b/automake.in
index b0707d9..3b67405 100755
--- a/automake.in
+++ b/automake.in
@@ -832,7 +832,7 @@ register_language ('name' => 'yacc',
                   'Name' => 'Yacc',
                   'config_vars' => ['YACC'],
                   'flags' => ['YFLAGS'],
-                  'compile' => '$(YACC) $(YFLAGS) $(AM_YFLAGS)',
+                  'compile' => '$(YACC) $(AM_YFLAGS) $(YFLAGS)',
                   'ccer' => 'YACC',
                   'compiler' => 'YACCCOMPILE',
                   'extensions' => ['.y'],
@@ -849,7 +849,7 @@ register_language ('name' => 'yaccxx',
                   'flags' => ['YFLAGS'],
                   'ccer' => 'YACC',
                   'compiler' => 'YACCCOMPILE',
-                  'compile' => '$(YACC) $(YFLAGS) $(AM_YFLAGS)',
+                  'compile' => '$(YACC) $(AM_YFLAGS) $(YFLAGS)',
                   'extensions' => ['.y++', '.yy', '.yxx', '.ypp'],
                   'output_extensions' => sub { (my $ext = $_[0]) =~ tr/y/c/;
                                                return ($ext,) },
@@ -863,7 +863,7 @@ register_language ('name' => 'lex',
                   'config_vars' => ['LEX'],
                   'rule_file' => 'lex',
                   'flags' => ['LFLAGS'],
-                  'compile' => '$(LEX) $(LFLAGS) $(AM_LFLAGS)',
+                  'compile' => '$(LEX) $(AM_LFLAGS) $(LFLAGS)',
                   'ccer' => 'LEX',
                   'compiler' => 'LEXCOMPILE',
                   'extensions' => ['.l'],
@@ -877,7 +877,7 @@ register_language ('name' => 'lexxx',
                   'config_vars' => ['LEX'],
                   'rule_file' => 'lex',
                   'flags' => ['LFLAGS'],
-                  'compile' => '$(LEX) $(LFLAGS) $(AM_LFLAGS)',
+                  'compile' => '$(LEX) $(AM_LFLAGS) $(LFLAGS)',
                   'ccer' => 'LEX',
                   'compiler' => 'LEXCOMPILE',
                   'extensions' => ['.l++', '.ll', '.lxx', '.lpp'],
diff --git a/doc/automake.texi b/doc/automake.texi
index 2bf3291..ea500a9 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6029,8 +6029,8 @@ Program Checks, autoconf, The Autoconf Manual}).
 
 @vindex YFLAGS
 @vindex AM_YFLAGS
-When @code{yacc} is invoked, it is passed @code{YFLAGS} and
address@hidden  The former is a user variable and the latter is
+When @code{yacc} is invoked, it is passed @code{AM_YFLAGS} and
address@hidden  The latter is a user variable and the former is
 intended for the @file{Makefile.am} author.
 
 @code{AM_YFLAGS} is usually used to pass the @option{-d} option to
@@ -6058,8 +6058,8 @@ autoconf, The Autoconf Manual}), but using 
@code{AM_PROG_LEX} macro
 
 @vindex LFLAGS
 @vindex AM_LFLAGS
-When @command{lex} is invoked, it is passed @code{LFLAGS} and
address@hidden  The former is a user variable and the latter is
+When @command{lex} is invoked, it is passed @code{AM_LFLAGS} and
address@hidden  The latter is a user variable and the former is
 intended for the @file{Makefile.am} author.
 
 When @code{AM_MAINTAINER_MODE} (@pxref{maintainer-mode}) is used, the
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b61e71b..568be8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -278,6 +278,7 @@ distcom6.test \
 distcom7.test \
 distdir.test \
 distlinks.test \
+distlinksbrk.test \
 distname.test \
 dollar.test \
 dollarvar.test \
@@ -394,6 +395,8 @@ lex2.test \
 lex3.test \
 lex4.test \
 lex5.test \
+lflags.test \
+lflags2.test \
 libexec.test \
 libobj2.test \
 libobj3.test \
@@ -769,6 +772,8 @@ yacc7.test \
 yacc8.test \
 yaccpp.test \
 yaccvpath.test \
+yflags.test \
+yflags2.test \
 $(parallel_tests)
 
 EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0edcd5b..0f5f9fb 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -516,6 +516,7 @@ distcom6.test \
 distcom7.test \
 distdir.test \
 distlinks.test \
+distlinksbrk.test \
 distname.test \
 dollar.test \
 dollarvar.test \
@@ -632,6 +633,8 @@ lex2.test \
 lex3.test \
 lex4.test \
 lex5.test \
+lflags.test \
+lflags2.test \
 libexec.test \
 libobj2.test \
 libobj3.test \
@@ -1007,6 +1010,8 @@ yacc7.test \
 yacc8.test \
 yaccpp.test \
 yaccvpath.test \
+yflags.test \
+yflags2.test \
 $(parallel_tests)
 
 EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
new file mode 100755
index 0000000..1e478ab
--- /dev/null
+++ b/tests/distlinksbrk.test
@@ -0,0 +1,78 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 distributed broken symlinks cause `make dist' to fail, and
+# to do so with (mostly) meaningful diagnostic.
+
+. ./defs || Exit 1
+
+set -e
+
+# We need, for our broken symlinks, names that make it hard to get false
+# positives when grepping make output to look for them.
+lnk_base=BrknSymlnk
+lnk1=${lnk_base}__001
+lnk2=${lnk_base}__002
+lnka=${lnk_base}__aaa
+lnkb=${lnk_base}__bbb
+
+ln -s nonesuch $lnk1 || {
+  echo "$me: cannot create broken symlinks" >&2
+  Exit 77
+}
+
+ln -s "`pwd`/nonesuch" $lnk2
+
+ln -s $lnk1 $lnka
+ln -s $lnka $lnkb
+
+# Sanity checks.  Use `test -r', since Solaris Sh doesn't grok `test -e'.
+test ! -r $lnk1
+test ! -r $lnk2
+test ! -r $lnka
+test ! -r $lnkb
+test -h $lnk1
+test -h $lnk2
+test -h $lnka
+test -h $lnkb
+
+cat >>configure.in <<END
+AC_OUTPUT
+END
+
+cat > Makefile.am <<END
+EXTRA_DIST = $lnk1 $lnk2 $lnka $lnkb
+END
+
+ls -l
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+
+# Distribution must fail.
+$MAKE distdir && Exit 1
+
+# Names of distributed broken symlinks should be reported in make output.
+$MAKE -k distdir >out 2>&1 || : # don't trust the exit status of make -k
+cat out
+$FGREP $lnk1 out
+$FGREP $lnk2 out
+$FGREP $lnka out
+$FGREP $lnkb out
+
+:
diff --git a/tests/lflags.test b/tests/lflags.test
new file mode 100755
index 0000000..97de608
--- /dev/null
+++ b/tests/lflags.test
@@ -0,0 +1,71 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
+# $(foo_LFLAGS).
+# Please keep this in sync with the sister tests lflags2.test, yflags.test
+# and yflags2.test
+
+. ./defs || Exit 1
+
+set -e
+
+cat >fake-lex <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >lex.yy.c
+echo 'extern int dummy;' >> lex.yy.c
+END
+chmod a+x fake-lex
+
+cat >> configure.in <<'END'
+AC_PROG_CC
+# Simulate presence of Lex using our fake-lex script.
+AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
+AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
+AC_SUBST([LEXLIB], [''])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.c foo.l
+bar_SOURCES = main.c bar.l
+AM_LFLAGS = __am_flags__
+bar_LFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+
+echo 'int main(void){ return 0; }' > main.c
+: > foo.l
+: > bar.l
+
+$AUTOCONF
+./configure
+env LFLAGS=__user_flags__ $MAKE -e
+
+ls -l
+
+cat foo.c
+grep '__am_flags__.*__user_flags__' foo.c
+cat bar-bar.c
+grep '__bar_flags__.*__user_flags__' bar-bar.c
+
+:
diff --git a/tests/lflags2.test b/tests/lflags2.test
new file mode 100755
index 0000000..df766b2
--- /dev/null
+++ b/tests/lflags2.test
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 $(LFLAGS) takes precedence over both $(AM_LFLAGS) and
+# $(foo_LFLAGS).
+# Please keep this in sync with the sister tests lflags.test, yflags.test
+# and yflags2.test
+
+required=g++ # FIXME: any working C++ compiler should be OK
+. ./defs || Exit 1
+
+set -e
+
+cat >fake-lex <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >lex.yy.c
+echo 'extern int dummy;' >> lex.yy.c
+END
+chmod a+x fake-lex
+
+cat >> configure.in <<'END'
+AC_PROG_CXX
+# Simulate presence of Lex using our fake-lex script.
+AC_SUBST([LEX], ['$(abs_top_srcdir)'/fake-lex])
+AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
+AC_SUBST([LEXLIB], [''])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.cc foo.ll
+bar_SOURCES = main.cc bar.l++
+AM_LFLAGS = __am_flags__
+bar_LFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+
+echo 'int main(void) { return 0; }' > main.cc
+: > foo.ll
+: > bar.l++
+
+$AUTOCONF
+./configure
+env LFLAGS=__user_flags__ $MAKE -e
+
+ls -l
+
+cat foo.cc
+grep '__am_flags__.*__user_flags__' foo.cc
+cat bar-bar.c++
+grep '__bar_flags__.*__user_flags__' bar-bar.c++
+
+:
diff --git a/tests/silent5.test b/tests/silent5.test
index e1134e8..4a9c4c1 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -80,11 +80,11 @@ do_and_check_verbose_build ()
   grep ' -c ' stdout
   grep ' -o ' stdout
 
-  grep '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+  $GREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
 
   if $rebuild; then :; else
     grep 'ylwrap ' stdout
-    grep '(LEX|YACC) ' stdout && Exit 1
+    $EGREP '(LEX|YACC) ' stdout && Exit 1
   fi
 
   unset rebuild
diff --git a/tests/yflags.test b/tests/yflags.test
new file mode 100755
index 0000000..fcb0c64
--- /dev/null
+++ b/tests/yflags.test
@@ -0,0 +1,69 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
+# $(foo_YFLAGS).
+# Please keep this in sync with the sister tests yflags2.test, lflags.test
+# and lflags2.test
+
+. ./defs || Exit 1
+
+set -e
+
+cat >fake-yacc <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x fake-yacc
+
+cat >> configure.in <<'END'
+AC_PROG_CC
+# Simulate presence of Yacc using our fake-yacc script.
+AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.c foo.y
+bar_SOURCES = main.c bar.y
+AM_YFLAGS = __am_flags__
+bar_YFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+
+echo 'int main(void){ return 0; }' > main.c
+: > foo.y
+: > bar.y
+
+$AUTOCONF
+./configure
+env YFLAGS=__user_flags__ $MAKE -e
+
+ls -l
+
+cat foo.c
+grep '__am_flags__.*__user_flags__' foo.c
+cat bar-bar.c
+grep '__bar_flags__.*__user_flags__' bar-bar.c
+
+:
diff --git a/tests/yflags2.test b/tests/yflags2.test
new file mode 100755
index 0000000..346c2e4
--- /dev/null
+++ b/tests/yflags2.test
@@ -0,0 +1,70 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
+# $(foo_YFLAGS).
+# Please keep this in sync with the sister tests yflags.test, lflags.test
+# and lflags2.test
+
+required=g++ # FIXME: any working C++ compiler should be OK
+. ./defs || Exit 1
+
+set -e
+
+cat >fake-yacc <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x fake-yacc
+
+cat >> configure.in <<'END'
+AC_PROG_CXX
+# Simulate presence of Yacc using our fake-yacc script.
+AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.cc foo.yy
+bar_SOURCES = main.cc bar.y++
+AM_YFLAGS = __am_flags__
+bar_YFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+
+echo 'int main(void) { return 0; }' > main.cc
+: > foo.yy
+: > bar.y++
+
+$AUTOCONF
+./configure
+env YFLAGS=__user_flags__ $MAKE -e
+
+ls -l
+
+cat foo.cc
+grep '__am_flags__.*__user_flags__' foo.cc
+cat bar-bar.c++
+grep '__bar_flags__.*__user_flags__' bar-bar.c++
+
+:


hooks/post-receive
-- 
GNU Automake