From: Robert Anisko Date: Sat, 25 Aug 2001 15:40:51 +0000 (+0000) Subject: Regen. X-Git-Tag: pre-merge-of-1-29-branch~58 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/944bc6ce434c4388ecda80b785c78d6191f9f415?ds=inline Regen. --- diff --git a/lib/Makefile.in b/lib/Makefile.in index 11b91047..3de218ee 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -98,14 +98,14 @@ AUTOMAKE_OPTIONS = ansi2knr noinst_LIBRARIES = libbison.a -INCLUDES = -I.. -I$(srcdir) -I../intl +INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl # Heck, we are still using an old version of Automake which does not # understand LIBOBJ additions using $objext... EXTRA_DIST = malloc.c realloc.c -libbison_a_SOURCES = error.c error.h getopt.h getopt.c getopt1.c obstack.h obstack.c quote.h quote.c quotearg.h quotearg.c xalloc.h xmalloc.c xstrdup.c +libbison_a_SOURCES = error.c error.h getopt.h getopt.c getopt1.c hash.h hash.c obstack.h obstack.c quote.h quote.c quotearg.h quotearg.c xalloc.h xmalloc.c xstrdup.c libbison_a_LIBADD = @LIBOBJS@ @@ -121,8 +121,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ANSI2KNR = @ANSI2KNR@ -libbison_a_OBJECTS = error$U.o getopt$U.o getopt1$U.o obstack$U.o \ -quote$U.o quotearg$U.o xmalloc$U.o xstrdup$U.o +libbison_a_OBJECTS = error$U.o getopt$U.o getopt1$U.o hash$U.o \ +obstack$U.o quote$U.o quotearg$U.o xmalloc$U.o xstrdup$U.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -136,10 +136,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/error.P .deps/getopt.P .deps/getopt1.P .deps/memchr.P \ -.deps/obstack.P .deps/quote.P .deps/quotearg.P .deps/stpcpy.P \ -.deps/strndup.P .deps/strnlen.P .deps/strspn.P .deps/xmalloc.P \ -.deps/xstrdup.P +DEP_FILES = .deps/error.P .deps/getopt.P .deps/getopt1.P .deps/hash.P \ +.deps/memchr.P .deps/obstack.P .deps/quote.P .deps/quotearg.P \ +.deps/stpcpy.P .deps/strndup.P .deps/strnlen.P .deps/strspn.P \ +.deps/xmalloc.P .deps/xstrdup.P SOURCES = $(libbison_a_SOURCES) OBJECTS = $(libbison_a_OBJECTS) @@ -213,6 +213,8 @@ getopt_.c: getopt.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c getopt1_.c: getopt1.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c +hash_.c: hash.c $(ANSI2KNR) + $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hash.c; then echo $(srcdir)/hash.c; else echo hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hash_.c memchr_.c: memchr.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c obstack_.c: obstack.c $(ANSI2KNR) @@ -233,9 +235,9 @@ xmalloc_.c: xmalloc.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c xstrdup_.c: xstrdup.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrdup.c; then echo $(srcdir)/xstrdup.c; else echo xstrdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrdup_.c -alloca_.o error_.o getopt_.o getopt1_.o memchr_.o obstack_.o quote_.o \ -quotearg_.o stpcpy_.o strndup_.o strnlen_.o strspn_.o xmalloc_.o \ -xstrdup_.o : $(ANSI2KNR) +alloca_.o error_.o getopt_.o getopt1_.o hash_.o memchr_.o obstack_.o \ +quote_.o quotearg_.o stpcpy_.o strndup_.o strnlen_.o strspn_.o \ +xmalloc_.o xstrdup_.o : $(ANSI2KNR) tags: TAGS diff --git a/src/Makefile.in b/src/Makefile.in index f4e8b240..63c31395 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -103,12 +103,12 @@ LDADD = @INTLLIBS@ ../lib/libbison.a bin_PROGRAMS = bison -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 vcg.c print_graph.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 -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 vcg.h vcg_defaults.h print_graph.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 macrotab.h print.h reader.h reduce.h symtab.h warshall.h system.h types.h vcg.h vcg_defaults.h print_graph.h pkgdata_DATA = bison.simple bison.hairy @@ -125,8 +125,8 @@ LIBS = @LIBS@ ANSI2KNR = ../lib/ansi2knr bison_OBJECTS = LR0$U.o closure$U.o complain$U.o conflicts$U.o \ derives$U.o files$U.o getargs$U.o gram$U.o lalr$U.o lex$U.o main$U.o \ -nullable$U.o output$U.o print$U.o reader$U.o reduce$U.o symtab$U.o \ -warshall$U.o vcg$U.o print_graph$U.o +nullable$U.o output$U.o macrotab$U.o print$U.o reader$U.o reduce$U.o \ +symtab$U.o warshall$U.o vcg$U.o print_graph$U.o bison_LDADD = $(LDADD) bison_DEPENDENCIES = ../lib/libbison.a bison_LDFLAGS = @@ -147,10 +147,10 @@ TAR = tar GZIP_ENV = --best DEP_FILES = .deps/LR0.P .deps/closure.P .deps/complain.P \ .deps/conflicts.P .deps/derives.P .deps/files.P .deps/getargs.P \ -.deps/gram.P .deps/lalr.P .deps/lex.P .deps/main.P .deps/nullable.P \ -.deps/output.P .deps/print.P .deps/print_graph.P .deps/reader.P \ -.deps/reduce.P .deps/symtab.P .deps/vcg.P .deps/vmsgetargs.P \ -.deps/warshall.P +.deps/gram.P .deps/lalr.P .deps/lex.P .deps/macrotab.P .deps/main.P \ +.deps/nullable.P .deps/output.P .deps/print.P .deps/print_graph.P \ +.deps/reader.P .deps/reduce.P .deps/symtab.P .deps/vcg.P \ +.deps/vmsgetargs.P .deps/warshall.P SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES) OBJECTS = $(bison_OBJECTS) @@ -226,8 +226,6 @@ bison: $(bison_OBJECTS) $(bison_DEPENDENCIES) $(LINK) $(bison_LDFLAGS) $(bison_OBJECTS) $(bison_LDADD) $(LIBS) LR0_.c: LR0.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/LR0.c; then echo $(srcdir)/LR0.c; else echo LR0.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > LR0_.c -alloca_.c: alloca.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c closure_.c: closure.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/closure.c; then echo $(srcdir)/closure.c; else echo closure.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > closure_.c complain_.c: complain.c $(ANSI2KNR) @@ -246,10 +244,10 @@ lalr_.c: lalr.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lalr.c; then echo $(srcdir)/lalr.c; else echo lalr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lalr_.c lex_.c: lex.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lex.c; then echo $(srcdir)/lex.c; else echo lex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lex_.c +macrotab_.c: macrotab.c $(ANSI2KNR) + $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/macrotab.c; then echo $(srcdir)/macrotab.c; else echo macrotab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > macrotab_.c main_.c: main.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/main.c; then echo $(srcdir)/main.c; else echo main.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > main_.c -memchr_.c: memchr.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c nullable_.c: nullable.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/nullable.c; then echo $(srcdir)/nullable.c; else echo nullable.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > nullable_.c output_.c: output.c $(ANSI2KNR) @@ -262,14 +260,6 @@ reader_.c: reader.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reader.c; then echo $(srcdir)/reader.c; else echo reader.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reader_.c reduce_.c: reduce.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reduce.c; then echo $(srcdir)/reduce.c; else echo reduce.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reduce_.c -stpcpy_.c: stpcpy.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c -strndup_.c: strndup.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c -strnlen_.c: strnlen.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c -strspn_.c: strspn.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strspn.c; then echo $(srcdir)/strspn.c; else echo strspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strspn_.c symtab_.c: symtab.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/symtab.c; then echo $(srcdir)/symtab.c; else echo symtab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > symtab_.c vcg_.c: vcg.c $(ANSI2KNR) @@ -278,10 +268,9 @@ vmsgetargs_.c: vmsgetargs.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vmsgetargs.c; then echo $(srcdir)/vmsgetargs.c; else echo vmsgetargs.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vmsgetargs_.c warshall_.c: warshall.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/warshall.c; then echo $(srcdir)/warshall.c; else echo warshall.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > warshall_.c -LR0_.o alloca_.o closure_.o complain_.o conflicts_.o derives_.o \ -files_.o getargs_.o gram_.o lalr_.o lex_.o main_.o memchr_.o \ -nullable_.o output_.o print_.o print_graph_.o reader_.o reduce_.o \ -stpcpy_.o strndup_.o strnlen_.o strspn_.o symtab_.o vcg_.o \ +LR0_.o closure_.o complain_.o conflicts_.o derives_.o files_.o \ +getargs_.o gram_.o lalr_.o lex_.o macrotab_.o main_.o nullable_.o \ +output_.o print_.o print_graph_.o reader_.o reduce_.o symtab_.o vcg_.o \ vmsgetargs_.o warshall_.o : $(ANSI2KNR) install-pkgdataDATA: $(pkgdata_DATA)