lalr1.cc: location_type: make sure we don't depend on loc.(begin|end).

[bison.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4ec82d9495cf7d77e7572a828b7238779cda274c..c2b4ec27fae6d57c49381d7cb0c30dfdd02b7d45 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,7 @@
 # Make bison/lib.
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001-2004, 2006, 2008-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
@@ -17,7 +18,7 @@
 
 include gnulib.mk
 
-AM_CFLAGS = $(WARN_CFLAGS)
+AM_CFLAGS += $(WARN_CFLAGS)
 
 # Implementation of bitsets.
 bitsets_sources = \
@@ -36,7 +37,6 @@ timevars_sources = \
 # Non-gnulib sources in Bison's internal library.
 libbison_a_SOURCES += \
   get-errno.h get-errno.c \
-  subpipe.h subpipe.c \
   $(bitsets_sources) $(additional_bitsets_sources) $(timevars_sources)
 
 # The Yacc compatibility library.