* src/acconfig.h: Don't protect config.h against multiple

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 71b8759c617500486d34e7e49ce78e50191cadb3..e7598e7bba624e40692766d0328a29d5de280336 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,27 +1,36 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-AUTOMAKE_OPTIONS = 1.4 ansi2knr
+AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
+
+DEFS = @DEFS@ \
+  -DXPFILE=\"${datadir}/bison.simple\" \
+  -DXPFILE1=\"${datadir}/bison.hairy\" \
+  -DLOCALEDIR=\"${datadir}/locale\"
+INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
+LDADD = @INTLLIBS@ ../lib/libbison.a

 
 bin_PROGRAMS = bison
 
 
 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 getopt.c getopt1.c
+bison_SOURCES = LR0.c allocate.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
 
 
 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
+noinst_HEADERS = alloc.h complain.h files.h getargs.h gram.h lex.h \
+ derives.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
 
 bison.simple: bison.s1 Makefile
 
 data_DATA = bison.simple bison.hairy
 
 EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar
 
 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 $@
+       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 $@

 
 DISTCLEANFILES = bison.simple
 
 DISTCLEANFILES = bison.simple