gnulib: update.

	* gnulib: Update to latest.
	* src/local.mk (AM_CFLAGS): Move to...
	* Makefile.am: here.
	* etc/prefix-gnulib-mk (prefix_assignment): Also transform
	AM_CFLAGS.

diff --git a/ChangeLog b/ChangeLog
index c698041ee0582a6b2b8f8632ce006d70e07c6fed..ec89f00df613163857ff46a1043d18b988555489 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-26  Akim Demaille  <demaille@gostai.com>
+
+       gnulib: update.
+       * gnulib: Update to latest.
+       * src/local.mk (AM_CFLAGS): Move to...
+       * Makefile.am: here.
+       * etc/prefix-gnulib-mk (prefix_assignment): Also transform
+       AM_CFLAGS.
+
 2009-03-02  Akim Demaille  <demaille@gostai.com>
 
        Comment changes.
@@ -14,7 +23,7 @@
        Yes, this obfuscates the point of this example, variants only.  But glr.cc
        cannot work (yet?) without locations.  This change makes it easier to use
        this example with glr.cc.
-       
+
        * examples/variant.yy (assert): %define it.
        (locations): Request them.
        (yylex): Bind the location to the stage.

diff --git a/Makefile.am b/Makefile.am
index e977fd547f149122475ff69b6aedd2c7054e93e0..ae424925c83279f0c1ec528e3661c88c66e887e3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## 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
@@ -31,6 +31,7 @@ EXTRA_DIST = .prev-version .version \
   OChangeLog PACKAGING
 
 # Initialization before completion by local.mk's.
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS =
 BUILT_SOURCES =
 DISTCLEANFILES =

diff --git a/etc/prefix-gnulib-mk b/etc/prefix-gnulib-mk
index e7f88382cfbbe367e7e543fff3cf81090db00077..08d22f288d9433a236fff9bf3f19dc553198ccd3 100755 (executable)
--- a/etc/prefix-gnulib-mk
+++ b/etc/prefix-gnulib-mk
@@ -50,7 +50,7 @@ sub prefix_assignment ($$)
 
   # Some variables are initialized by gnulib.mk, and we don't want
   # that.  Change '=' to '+='.
-  if ($lhs_and_assign_op =~ /^(SUBDIRS|EXTRA_DIST|BUILT_SOURCES|SUFFIXES|MOSTLYCLEANFILES|CLEANFILES|DISTCLEANFILES|MAINTAINERCLEANFILES|AM_CPPFLAGS|AM_GNU_GETTEXT) =/)
+  if ($lhs_and_assign_op =~ /^(SUBDIRS|EXTRA_DIST|BUILT_SOURCES|SUFFIXES|MOSTLYCLEANFILES|CLEANFILES|DISTCLEANFILES|MAINTAINERCLEANFILES|AM_CFLAGS|AM_CPPFLAGS|AM_GNU_GETTEXT) =/)
     {
       $lhs_and_assign_op =~ s/=/+=/;
     }

diff --git a/gnulib b/gnulib
index 5812ea3e47b3db87cc42c99b1d3cd8e44c8c0af3..5a1286a9f8597c0063a82645b55f3e97433fc521 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 5812ea3e47b3db87cc42c99b1d3cd8e44c8c0af3
+Subproject commit 5a1286a9f8597c0063a82645b55f3e97433fc521

diff --git a/src/local.mk b/src/local.mk
index 9508749d73ed7cf76092566548df2dd68899711b..6d9433062254add85171a0af735ecebaef1fbb72 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,5 +1,5 @@
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## 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
@@ -20,8 +20,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS += -I$(top_builddir)
 
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-
 LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to