X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1853982561f87a729024577156def20433035946..dc2825ae898c526ea3619450112b2ea44f437151:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e4fede47..30248f86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,33 +1,29 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 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	\
+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
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
-DEFS = @DEFS@ \
-  -DXPFILE=\"${datadir}/bison.simple\" \
-  -DXPFILE1=\"${datadir}/bison.hairy\" \
-  -DLOCALEDIR=\"${datadir}/locale\"
-INCLUDES = -I../intl -I$(top_srcdir)/intl -I..
-LDADD = @INTLLIBS@ ../lib/libbison.a
-
-noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.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
+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
 
-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