Update

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2284284a347255024146031d27c572540db9ff4c..ae5e26d73c455dedbf7a01c0b90a5958dfcbfb86 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,28 +1,32 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.4 ansi2knr
+AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
+DEFS = @DEFS@ \
+  -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 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 version.c getopt.c   \
-    getopt1.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   \
+    macrotab.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
-bison_LDADD = @INTLLIBS@ @ALLOCA@
-INCLUDES = -I../intl -I$(top_srcdir)/intl
-
-noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
- symtab.h system.h types.h getopt.h
-
-data_DATA = bison.simple bison.hairy
-
-EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
+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      \
+ 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
-       -rm -f $@
-       sed -e "/^#line/ s|bison|$(datadir)/bison|" -e "s/@bison_version@/$(VERSION)/" < $(srcdir)/bison.s1 > $@-tmp
-       mv $@-tmp $@
+pkgdata_DATA = bison.simple bison.hairy
 
-DISTCLEANFILES = bison.simple
+EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar