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.
This commit is contained in:
Akim Demaille
2009-03-27 07:23:53 +01:00
parent 91be6b283e
commit 11c073b7e5
5 changed files with 17 additions and 9 deletions

View File

@@ -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> 2009-03-02 Akim Demaille <demaille@gostai.com>
Comment changes. Comment changes.
@@ -14,7 +23,7 @@
Yes, this obfuscates the point of this example, variants only. But glr.cc 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 cannot work (yet?) without locations. This change makes it easier to use
this example with glr.cc. this example with glr.cc.
* examples/variant.yy (assert): %define it. * examples/variant.yy (assert): %define it.
(locations): Request them. (locations): Request them.
(yylex): Bind the location to the stage. (yylex): Bind the location to the stage.

View File

@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software ## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
## Foundation, Inc. ## Free Software Foundation, Inc.
## This program is free software: you can redistribute it and/or modify ## 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 ## it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@ EXTRA_DIST = .prev-version .version \
OChangeLog PACKAGING OChangeLog PACKAGING
# Initialization before completion by local.mk's. # Initialization before completion by local.mk's.
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
AM_CPPFLAGS = AM_CPPFLAGS =
BUILT_SOURCES = BUILT_SOURCES =
DISTCLEANFILES = DISTCLEANFILES =

View File

@@ -50,7 +50,7 @@ sub prefix_assignment ($$)
# Some variables are initialized by gnulib.mk, and we don't want # Some variables are initialized by gnulib.mk, and we don't want
# that. Change '=' to '+='. # 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/=/+=/; $lhs_and_assign_op =~ s/=/+=/;
} }

2
gnulib

Submodule gnulib updated: 5812ea3e47...5a1286a9f8

View File

@@ -1,5 +1,5 @@
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software ## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
## Foundation, Inc. ## Free Software Foundation, Inc.
## This program is free software: you can redistribute it and/or modify ## 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 ## 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. # Find builddir/src/scan-code.c etc.
AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -I$(top_builddir)
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL) LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL)
# Use our own Bison to build the parser. Of course, you ought to # Use our own Bison to build the parser. Of course, you ought to