From 11c073b7e53fb82c67f1adf8cd7c2e60b7518729 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 27 Mar 2009 07:23:53 +0100 Subject: [PATCH] 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. --- ChangeLog | 11 ++++++++++- Makefile.am | 5 +++-- etc/prefix-gnulib-mk | 2 +- gnulib | 2 +- src/local.mk | 6 ++---- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c698041e..ec89f00d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-26 Akim Demaille + + 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 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 e977fd54..ae424925 100644 --- 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 e7f88382..08d22f28 100755 --- 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 5812ea3e..5a1286a9 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 5812ea3e47b3db87cc42c99b1d3cd8e44c8c0af3 +Subproject commit 5a1286a9f8597c0063a82645b55f3e97433fc521 diff --git a/src/local.mk b/src/local.mk index 9508749d..6d943306 100644 --- 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 -- 2.45.2