* src/lex.c (percent_table): Add tok_define.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 53475eb92dd7067a0ef51832420dc1fa720a7f10..ae5e26d73c455dedbf7a01c0b90a5958dfcbfb86 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
-
 DEFS = @DEFS@ \
-  -DXPFILE=\"${datadir}/bison.simple\" \
-  -DXPFILE1=\"${datadir}/bison.hairy\" \
-  -DLOCALEDIR=\"${datadir}/locale\"
+  -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
+  -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
+  -DLOCALEDIR=\"$(datadir)/locale\"
+
 INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
 LDADD = @INTLLIBS@ ../lib/libbison.a
 
@@ -14,7 +14,8 @@ bison_SOURCES = LR0.c closure.c complain.c conflicts.c        \
     derives.c  \
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
     output.c   \
-    print.c reader.c reduce.c symtab.c warshall.c
+    macrotab.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
@@ -22,17 +23,10 @@ noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
  output.h state.h      \
- print.h reader.h reduce.h symtab.h warshall.h system.h types.h
-
-data_DATA = bison.simple bison.hairy
-
-EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
+ macrotab.h \
+ print.h reader.h reduce.h symtab.h warshall.h system.h types.h \
+ vcg.h vcg_defaults.h print_graph.h
 
-bison.simple: bison.s1 Makefile
-       sed -e "s/@bison_version@/$(VERSION)/" $(srcdir)/bison.s1 | \
-       awk '\
-       /^#line/ { printf "#line %d \"$(datadir)/bison.simple\"\n", NR+1; next }\
-       { print }' >$@t
-       mv $@t $@
+pkgdata_DATA = bison.simple bison.hairy
 
-DISTCLEANFILES = bison.simple
+EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar