Fix handling of yychar manipulation in user semantic actions.

[bison.git] / src / local.mk

diff --git a/src/local.mk b/src/local.mk
index 6d9433062254add85171a0af735ecebaef1fbb72..753172b0f1b8ec13122df0f201abb757ea0b9bdd 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -20,20 +20,28 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS += -I$(top_builddir)
 
-LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL)
+LDADD = lib/libbison.a $(LIBINTL)
 
 # Use our own Bison to build the parser.  Of course, you ought to
 # keep a sane version of Bison nearby...
-YACC = $(top_builddir)/tests/bison -y
+BISON = tests/bison
+YACC = $(BISON) -y
 AM_YFLAGS = -dv --warnings=all,error --report=all
 
 bin_PROGRAMS = src/bison
 bin_SCRIPTS = $(YACC_SCRIPT)
 EXTRA_SCRIPTS = src/yacc
 
+src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
 src_bison_SOURCES =                            \
+  src/AnnotationList.c                         \
+  src/AnnotationList.h                         \
+  src/InadequacyList.c                         \
+  src/InadequacyList.h                         \
   src/LR0.c                                    \
   src/LR0.h                                    \
+  src/Sbitset.c                                        \
+  src/Sbitset.h                                        \
   src/assoc.c                                  \
   src/assoc.h                                  \
   src/closure.c                                        \
@@ -55,11 +63,15 @@ src_bison_SOURCES =                         \
   src/graphviz.h                               \
   src/lalr.c                                   \
   src/lalr.h                                   \
+  src/ielr.c                                   \
+  src/ielr.h                                   \
   src/location.c                               \
   src/location.h                               \
   src/main.c                                   \
-  src/muscle_tab.c                             \
-  src/muscle_tab.h                             \
+  src/muscle-tab.c                             \
+  src/muscle-tab.h                             \
+  src/named-ref.c                              \
+  src/named-ref.h                              \
   src/nullable.c                               \
   src/nullable.h                               \
   src/output.c                                 \