* src/reduce.c (reduce_grammar): First reduce the nonterminals,

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 067bc11054141db3f9eaef6ec3e7508f29e9bf90..bc591744ed0cab4f0d0638ffe3122aa160589b6d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2001 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002 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
 
 ## 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


@@ -18,18 +18,18 @@
 AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
 DEFS = @DEFS@ \
 AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
 DEFS = @DEFS@ \

-  -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
-  -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
+  -DPKGDATADIR=\"$(pkgdatadir)\" \

   -DLOCALEDIR=\"$(datadir)/locale\"
 
   -DLOCALEDIR=\"$(datadir)/locale\"
 

-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
+YFLAGS = "-dv"

 
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \
            -I$(top_builddir)      \
 
 # libintl.h in is build/intl, intl/libgettext.h in src/,
 # config.h in build/.
 INCLUDES = -I$(top_builddir)/intl \
            -I$(top_builddir)      \

-           -I$(top_srcdir)/lib    \
-           -I$(top_srcdir)
+           -I$(top_srcdir)/intl \
+           -I$(top_srcdir)/lib

 
 LDADD = $(INTLLIBS) ../lib/libbison.a
 
 
 LDADD = $(INTLLIBS) ../lib/libbison.a
 


@@ -43,16 +43,17 @@ bison_SOURCES = LR0.c closure.c complain.c conflicts.c      \
     print_graph.h print_graph.c \
     muscle_tab.h muscle_tab.c \
     options.h options.c \
     print_graph.h print_graph.c \
     muscle_tab.h muscle_tab.c \
     options.h options.c \

-    print.c reader.c reduce.c symtab.c warshall.c vcg.c
+    print.c reader.c reduce.c symtab.c vcg.c \
+    scan-skel.l
+
+BUILT_SOURCES = scan-skel.c

 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \

- print.h reader.h reduce.h symtab.h warshall.h system.h \
+ print.h reader.h reduce.h symtab.h system.h \

  types.h vcg.h vcg_defaults.h
 
  types.h vcg.h vcg_defaults.h
 

-pkgdata_DATA = bison.simple bison.hairy
-
-EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar
+EXTRA_DIST = build.com bison.cld vmshlp.mar