* src/reader.c (parse_thong_decl): Formatting changes.

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 99e0c89000284f5147853398ff4b941545815203..479bd977bdda4994202960f1529d1f1c85ed0a83 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,38 +1,32 @@
 ## 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
 
 bin_PROGRAMS = bison
 
-bison_SOURCES = LR0.c allocate.c closure.c complain.c conflicts.c      \
+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
+    output.c print_graph.c \
+    muscle_tab.c options.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
-noinst_HEADERS = alloc.h closure.h complain.h \
+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      \
- reader.h reduce.h symtab.h system.h types.h
-
-data_DATA = bison.simple bison.hairy
-
-EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
+ output.h print_graph.h        \
+ muscle_tab.h options.h \
+ print.h reader.h reduce.h state.h symtab.h warshall.h system.h \
+ types.h vcg.h vcg_defaults.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