Regen.

diff --git a/config/Makefile.in b/config/Makefile.in
index a458832364735919a4ceff278ae884a9487f7077..35eae0eab74eb2988f61faf6ba99ee0f2eafaba2 100644 (file)
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -106,7 +106,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =

-DIST_COMMON = Makefile.am Makefile.in config.guess config.sub \
+DIST_COMMON = Makefile.am Makefile.in config.guess config.sub depcomp \

        install-sh mdate-sh missing mkinstalldirs texinfo.tex
 all: all-am
 
        install-sh mdate-sh missing mkinstalldirs texinfo.tex
 all: all-am
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 68376ddb3ad062086b2b7ab8f70a3cfb4431ece6..4ceb090c951065716c56dd145e6ec1c6cea8e3c8 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

 
 

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.


@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 

+@SET_MAKE@

 
 SHELL = @SHELL@
 
 
 SHELL = @SHELL@
 


@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include

-
-DESTDIR =
-

 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@

-

 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@


@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@

-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

+INSTALL_HEADER = $(INSTALL_DATA)

 transform = @program_transform_name@
 transform = @program_transform_name@

-

 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :


@@ -59,20 +57,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@

+AMTAR = @AMTAR@

 AT_TESTPATH = @AT_TESTPATH@
 AT_TESTPATH = @AT_TESTPATH@

+AWK = @AWK@

 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@

+DEPDIR = @DEPDIR@

 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

+EXEEXT = @EXEEXT@

 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@

+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@


@@ -81,9 +84,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@

-MAKEINFO = @MAKEINFO@

 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@

+OBJEXT = @OBJEXT@

 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@


@@ -93,6 +96,9 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@

+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 
 AUTOMAKE_OPTIONS = 1.4
 
 
 AUTOMAKE_OPTIONS = 1.4
 


@@ -103,44 +109,40 @@ bison_TEXINFOS = gpl.texi fdl.texi
 EXTRA_DIST = FAQ bison.1 bison.rnh refcard.tex
 
 CLEANFILES = refcard.dvi refcard.log refcard.ps
 EXTRA_DIST = FAQ bison.1 bison.rnh refcard.tex
 
 CLEANFILES = refcard.dvi refcard.log refcard.ps

+subdir = doc

 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-TEXI2DVI = texi2dvi
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =

 TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
 INFO_DEPS = bison.info
 DVIS = bison.dvi
 TEXINFOS = bison.texinfo
 TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
 INFO_DEPS = bison.info
 DVIS = bison.dvi
 TEXINFOS = bison.texinfo

-man1dir = $(mandir)/man1
-MANS = $(man_MANS)

 
 NROFF = nroff
 
 NROFF = nroff

-DIST_COMMON =  $(bison_TEXINFOS) Makefile.am Makefile.in stamp-vti \
-version.texi
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+MANS = $(man_MANS)
+DIST_COMMON = $(bison_TEXINFOS) Makefile.am Makefile.in stamp-vti \
+       version.texi
+all: all-am

 
 

-TAR = tar
-GZIP_ENV = --best
-all: all-redirect

 .SUFFIXES:
 .SUFFIXES:

-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-$(srcdir)/version.texi: stamp-vti
+.SUFFIXES: .dvi .info .ps .texinfo
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  doc/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && \
+         CONFIG_HEADERS= CONFIG_LINKS= \
+         CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+
+$(srcdir)/version.texi:  $(srcdir)/stamp-vti

        @:
        @:

-

 $(srcdir)/stamp-vti: bison.texinfo $(top_srcdir)/configure.in
 $(srcdir)/stamp-vti: bison.texinfo $(top_srcdir)/configure.in

-       @echo "@set UPDATED `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/bison.texinfo`" > vti.tmp
-       @echo "@set EDITION $(VERSION)" >> vti.tmp
-       @echo "@set VERSION $(VERSION)" >> vti.tmp
+       @(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/bison.texinfo`; \
+       echo "@set UPDATED $$1 $$2 $$3"; \
+       echo "@set UPDATED-MONTH $$2 $$3"; \
+       echo "@set EDITION $(VERSION)"; \
+       echo "@set VERSION $(VERSION)") > vti.tmp

        @cmp -s vti.tmp $(srcdir)/version.texi \
          || (echo "Updating $(srcdir)/version.texi"; \
              cp vti.tmp $(srcdir)/version.texi)
        @cmp -s vti.tmp $(srcdir)/version.texi \
          || (echo "Updating $(srcdir)/version.texi"; \
              cp vti.tmp $(srcdir)/version.texi)


@@ -150,134 +152,84 @@ $(srcdir)/stamp-vti: bison.texinfo $(top_srcdir)/configure.in
 mostlyclean-vti:
        -rm -f vti.tmp
 
 mostlyclean-vti:
        -rm -f vti.tmp
 

-clean-vti:
-
-distclean-vti:
-

 maintainer-clean-vti:
        -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 
 maintainer-clean-vti:
        -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 

-bison.info: bison.texinfo version.texi $(bison_TEXINFOS)
-bison.dvi: bison.texinfo version.texi $(bison_TEXINFOS)
-
-
-DVIPS = dvips
-
-.texi.info:
-       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-       cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texi.dvi:
-       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.texi:
-       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-       cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+bison.info: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)
+bison.dvi: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)

 
 .texinfo.info:
        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
 
 .texinfo.info:
        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \

-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texinfo:
-       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-       cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+         && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+              `echo $< | sed 's,.*/,,'`

 
 .texinfo.dvi:
 
 .texinfo.dvi:

-       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+       TEXINPUTS=$(top_srcdir)/config:$$TEXINPUTS \
+       MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+       $(TEXI2DVI) $<

 
 

-.txi.info:
+.texinfo:

        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \
        @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
        cd $(srcdir) \

-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+         && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+              `echo $< | sed 's,.*/,,'`

 
 

-.txi:
-       @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-       cd $(srcdir) \
-         && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+MAKEINFO = @MAKEINFO@
+TEXI2DVI = texi2dvi
+DVIPS = dvips

 .dvi.ps:
        $(DVIPS) $< -o $@
 
 .dvi.ps:
        $(DVIPS) $< -o $@
 

-install-info-am: $(INFO_DEPS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(infodir)
-       @list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         d=$(srcdir); \
-         for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-           if test -f $$d/$$ifile; then \
-             echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-             $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-           else : ; fi; \
-         done; \
-       done
-       @$(POST_INSTALL)
-       @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+uninstall-info-am:
+       $(PRE_UNINSTALL)
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \

          list='$(INFO_DEPS)'; \
          for file in $$list; do \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \

-           echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-           install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \

          done; \
          done; \

-       else : ; fi
-
-uninstall-info:
-       $(PRE_UNINSTALL)
-       @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-         ii=yes; \
-       else ii=; fi; \
-       list='$(INFO_DEPS)'; \
-       for file in $$list; do \
-         test -z "$$ii" \
-           || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-       done
+       else :; fi

        @$(NORMAL_UNINSTALL)
        @$(NORMAL_UNINSTALL)

-       list='$(INFO_DEPS)'; \
+       @list='$(INFO_DEPS)'; \

        for file in $$list; do \
        for file in $$list; do \

-         (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+         (if cd $(DESTDIR)$(infodir); then \
+            echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
+            rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
+          else :; fi); \

        done
 
 dist-info: $(INFO_DEPS)
        list='$(INFO_DEPS)'; \
        for base in $$list; do \
          d=$(srcdir); \
        done
 
 dist-info: $(INFO_DEPS)
        list='$(INFO_DEPS)'; \
        for base in $$list; do \
          d=$(srcdir); \

-         for file in `cd $$d && eval echo $$base*`; do \
+         for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \

            test -f $(distdir)/$$file \
            test -f $(distdir)/$$file \

-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

            || cp -p $$d/$$file $(distdir)/$$file; \
          done; \
        done
 
 mostlyclean-aminfo:
            || cp -p $$d/$$file $(distdir)/$$file; \
          done; \
        done
 
 mostlyclean-aminfo:

-       -rm -f bison.aux bison.cp bison.cps bison.dvi bison.fn bison.fns \
-         bison.ky bison.kys bison.ps bison.log bison.pg bison.toc \
-         bison.tp bison.tps bison.vr bison.vrs bison.op bison.tr \
-         bison.cv bison.cn
-
-clean-aminfo:
-
-distclean-aminfo:
+       -rm -f bison.aux bison.cp bison.cps bison.dvi bison.fn bison.ky bison.log \
+         bison.pg bison.ps bison.toc bison.tp bison.vr

 
 maintainer-clean-aminfo:
 
 maintainer-clean-aminfo:

-       cd $(srcdir) && for i in $(INFO_DEPS); do \
+       cd $(srcdir) && \
+       for i in $(INFO_DEPS); do \

          rm -f $$i; \
          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
            rm -f $$i-[0-9]*; \
          fi; \
        done
 
          rm -f $$i; \
          if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
            rm -f $$i-[0-9]*; \
          fi; \
        done
 

-install-man1:
+man1dir = $(mandir)/man1
+install-man1: $(man1_MANS) $(man_MANS)
+       @$(NORMAL_INSTALL)

        $(mkinstalldirs) $(DESTDIR)$(man1dir)
        $(mkinstalldirs) $(DESTDIR)$(man1dir)

-       @list='$(man1_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
+       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+       for i in $$l2; do \

          case "$$i" in \
            *.1*) list="$$list $$i" ;; \
          esac; \
          case "$$i" in \
            *.1*) list="$$list $$i" ;; \
          esac; \


@@ -287,14 +239,16 @@ install-man1:
          else file=$$i; fi; \
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
          else file=$$i; fi; \
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+         inst=`echo $$inst | sed -e 's/^.*\///'`; \

          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
          echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
          $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
        done
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
          echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
          $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
        done

-

 uninstall-man1:
 uninstall-man1:

-       @list='$(man1_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
+       @$(NORMAL_UNINSTALL)
+       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+       for i in $$l2; do \

          case "$$i" in \
            *.1*) list="$$list $$i" ;; \
          esac; \
          case "$$i" in \
            *.1*) list="$$list $$i" ;; \
          esac; \


@@ -302,113 +256,147 @@ uninstall-man1:
        for i in $$list; do \
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
        for i in $$list; do \
          ext=`echo $$i | sed -e 's/^.*\\.//'`; \
          inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

+         inst=`echo $$inst | sed -e 's/^.*\///'`; \

          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
          echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
          rm -f $(DESTDIR)$(man1dir)/$$inst; \
        done
          inst=`echo $$inst | sed '$(transform)'`.$$ext; \
          echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
          rm -f $(DESTDIR)$(man1dir)/$$inst; \
        done

-install-man: $(MANS)
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) install-man1
-uninstall-man:
-       @$(NORMAL_UNINSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) uninstall-man1

 tags: TAGS
 TAGS:
 
 
 tags: TAGS
 TAGS:
 
 

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 
 

-subdir = doc
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 
 distdir: $(DISTFILES)
 
 distdir: $(DISTFILES)

-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       distdir=`cd $(distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile

        @for file in $(DISTFILES); do \
        @for file in $(DISTFILES); do \

-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           $(mkinstalldirs) "$(distdir)/$$dir"; \
+         fi; \

          if test -d $$d/$$file; then \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pR $$d/$$file $(distdir) \
+           || exit 1; \

          else \
            test -f $(distdir)/$$file \
          else \
            test -f $(distdir)/$$file \

-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \

          fi; \
        done
          fi; \
        done

-       $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-am
-dvi-am: $(DVIS)
-dvi: dvi-am
+       $(MAKE) $(AM_MAKEFLAGS) \
+         top_distdir="${top_distdir}" distdir="$(distdir)" \
+         dist-info

 check-am: all-am
 check: check-am
 check-am: all-am
 check: check-am

-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(INFO_DEPS) $(MANS)

 
 

-install-data-am: install-info-am install-man
-install-data: install-data-am
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir)

 
 

-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 install: install-am
 install: install-am

-uninstall-am: uninstall-info uninstall-man
+install-exec: install-exec-am
+install-data: install-data-am

 uninstall: uninstall-am
 uninstall: uninstall-am

-all-am: Makefile $(INFO_DEPS) $(MANS)
-all-redirect: all-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1

 
 

+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 
 

+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

 mostlyclean-generic:
 
 clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 mostlyclean-generic:
 
 clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:

-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 
 maintainer-clean-generic:
 
 maintainer-clean-generic:

-mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am

 
 

-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am

 
 

-clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am
+distclean: distclean-am

 
 

-clean: clean-am
+distclean-am: clean-am distclean-generic

 
 

-distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
+dvi: dvi-am

 
 

-distclean: distclean-am
+dvi-am: $(DVIS)

 
 

-maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
-               maintainer-clean-generic distclean-am
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am install-man
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(infodir)
+       @list='$(INFO_DEPS)'; \
+       for file in $$list; do \
+         d=$(srcdir); \
+         for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+           if test -f $$d/$$ifile; then \
+             echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+             $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+           else : ; fi; \
+         done; \
+       done
+       @$(POST_INSTALL)
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+         list='$(INFO_DEPS)'; \
+         for file in $$list; do \
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+           install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+         done; \
+       else : ; fi
+install-man: install-man1
+
+installcheck-am:

 
 maintainer-clean: maintainer-clean-am
 
 
 maintainer-clean: maintainer-clean-am
 

-.PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
-install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
-clean-aminfo maintainer-clean-aminfo install-man1 uninstall-man1 \
-install-man uninstall-man tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+       maintainer-clean-generic maintainer-clean-vti
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
+
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man1
+
+.PHONY: all all-am check check-am clean clean-generic dist-info \
+       distclean distclean-generic distdir dvi dvi-am info info-am \
+       install install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am install-man \
+       install-man1 install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-aminfo \
+       maintainer-clean-generic maintainer-clean-vti mostlyclean \
+       mostlyclean-aminfo mostlyclean-generic mostlyclean-vti \
+       uninstall uninstall-am uninstall-info-am uninstall-man \
+       uninstall-man1

 
 
 refcard.dvi: refcard.tex
        tex refcard.tex
 
 refcard.ps: refcard.dvi
 
 
 refcard.dvi: refcard.tex
        tex refcard.tex
 
 refcard.ps: refcard.dvi

-

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/doc/bison.info b/doc/bison.info
index fb320c87c72aec1deddf8a424af32085266e6ad5..c1425227439cd0ac341b429e5ff429d39704c088 100644 (file)
--- a/doc/bison.info
+++ b/doc/bison.info
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -30,112 +30,112 @@ instead of in the original English.
 
 \1f
 Indirect:
 
 \1f
 Indirect:

-bison.info-1: 1313
-bison.info-2: 50357
-bison.info-3: 99982
-bison.info-4: 148180
-bison.info-5: 190964
+bison.info-1: 1292
+bison.info-2: 50351
+bison.info-3: 99751
+bison.info-4: 147940
+bison.info-5: 190640

 \1f
 Tag Table:
 (Indirect)
 \1f
 Tag Table:
 (Indirect)

-Node: Top\7f1313
-Node: Introduction\7f8698
-Node: Conditions\7f9973
-Node: Copying\7f11437
-Node: Concepts\7f30640
-Node: Language and Grammar\7f31719
-Node: Grammar in Bison\7f36735
-Node: Semantic Values\7f38659
-Node: Semantic Actions\7f40760
-Node: Locations Overview\7f41949
-Node: Bison Parser\7f43396
-Node: Stages\7f45708
-Node: Grammar Layout\7f46991
-Node: Examples\7f48248
-Node: RPN Calc\7f49383
-Node: Rpcalc Decls\7f50357
-Node: Rpcalc Rules\7f51944
-Node: Rpcalc Input\7f53744
-Node: Rpcalc Line\7f55205
-Node: Rpcalc Expr\7f56320
-Node: Rpcalc Lexer\7f58265
-Node: Rpcalc Main\7f60837
-Node: Rpcalc Error\7f61235
-Node: Rpcalc Gen\7f62243
-Node: Rpcalc Compile\7f63392
-Node: Infix Calc\7f64267
-Node: Simple Error Recovery\7f66974
-Node: Multi-function Calc\7f68860
-Node: Mfcalc Decl\7f70426
-Node: Mfcalc Rules\7f72449
-Node: Mfcalc Symtab\7f73829
-Node: Exercises\7f80202
-Node: Grammar File\7f80708
-Node: Grammar Outline\7f81556
-Node: C Declarations\7f82290
-Node: Bison Declarations\7f82870
-Node: Grammar Rules\7f83282
-Node: C Code\7f83742
-Node: Symbols\7f84672
-Node: Rules\7f89753
-Node: Recursion\7f91392
-Node: Semantics\7f93111
-Node: Value Type\7f94205
-Node: Multiple Types\7f94877
-Node: Actions\7f95894
-Node: Action Types\7f98679
-Node: Mid-Rule Actions\7f99982
-Node: Locations\7f105552
-Node: Location Type\7f106200
-Node: Actions and Locations\7f106758
-Node: Location Default Action\7f108914
-Node: Declarations\7f110377
-Node: Token Decl\7f111696
-Node: Precedence Decl\7f113709
-Node: Union Decl\7f115260
-Node: Type Decl\7f116104
-Node: Expect Decl\7f117010
-Node: Start Decl\7f118556
-Node: Pure Decl\7f118934
-Node: Decl Summary\7f120611
-Node: Multiple Parsers\7f125994
-Node: Interface\7f127488
-Node: Parser Function\7f128360
-Node: Lexical\7f129195
-Node: Calling Convention\7f130601
-Node: Token Values\7f133372
-Node: Token Positions\7f134521
-Node: Pure Calling\7f135406
-Node: Error Reporting\7f138338
-Node: Action Features\7f140460
-Node: Algorithm\7f143755
-Node: Look-Ahead\7f146048
-Node: Shift/Reduce\7f148180
-Node: Precedence\7f151092
-Node: Why Precedence\7f151743
-Node: Using Precedence\7f153608
-Node: Precedence Examples\7f154576
-Node: How Precedence\7f155277
-Node: Contextual Precedence\7f156426
-Node: Parser States\7f158217
-Node: Reduce/Reduce\7f159460
-Node: Mystery Conflicts\7f163021
-Node: Stack Overflow\7f166407
-Node: Error Recovery\7f167780
-Node: Context Dependency\7f172916
-Node: Semantic Tokens\7f173764
-Node: Lexical Tie-ins\7f176781
-Node: Tie-in Recovery\7f178329
-Node: Debugging\7f180501
-Node: Invocation\7f183802
-Node: Bison Options\7f185054
-Node: Environment Variables\7f188488
-Node: Option Cross Key\7f189336
-Node: VMS Invocation\7f190180
-Node: Table of Symbols\7f190964
-Node: Glossary\7f198603
-Node: Copying This Manual\7f204907
-Node: GNU Free Documentation License\7f205116
-Node: Index\7f224981
+Node: Top\7f1292
+Node: Introduction\7f8694
+Node: Conditions\7f9969
+Node: Copying\7f11433
+Node: Concepts\7f30636
+Node: Language and Grammar\7f31715
+Node: Grammar in Bison\7f36731
+Node: Semantic Values\7f38655
+Node: Semantic Actions\7f40756
+Node: Locations Overview\7f41945
+Node: Bison Parser\7f43392
+Node: Stages\7f45704
+Node: Grammar Layout\7f46987
+Node: Examples\7f48243
+Node: RPN Calc\7f49378
+Node: Rpcalc Decls\7f50351
+Node: Rpcalc Rules\7f51916
+Node: Rpcalc Input\7f53716
+Node: Rpcalc Line\7f55177
+Node: Rpcalc Expr\7f56292
+Node: Rpcalc Lexer\7f58237
+Node: Rpcalc Main\7f60809
+Node: Rpcalc Error\7f61207
+Node: Rpcalc Gen\7f62215
+Node: Rpcalc Compile\7f63345
+Node: Infix Calc\7f64220
+Node: Simple Error Recovery\7f66927
+Node: Multi-function Calc\7f68813
+Node: Mfcalc Decl\7f70379
+Node: Mfcalc Rules\7f72402
+Node: Mfcalc Symtab\7f73782
+Node: Exercises\7f80155
+Node: Grammar File\7f80661
+Node: Grammar Outline\7f81509
+Node: Prologue\7f82197
+Node: Bison Declarations\7f82737
+Node: Grammar Rules\7f83143
+Node: Epilogue\7f83605
+Node: Symbols\7f84455
+Node: Rules\7f89536
+Node: Recursion\7f91175
+Node: Semantics\7f92894
+Node: Value Type\7f93988
+Node: Multiple Types\7f94646
+Node: Actions\7f95663
+Node: Action Types\7f98448
+Node: Mid-Rule Actions\7f99751
+Node: Locations\7f105321
+Node: Location Type\7f105969
+Node: Actions and Locations\7f106527
+Node: Location Default Action\7f108683
+Node: Declarations\7f110146
+Node: Token Decl\7f111465
+Node: Precedence Decl\7f113478
+Node: Union Decl\7f115029
+Node: Type Decl\7f115873
+Node: Expect Decl\7f116779
+Node: Start Decl\7f118325
+Node: Pure Decl\7f118703
+Node: Decl Summary\7f120380
+Node: Multiple Parsers\7f125763
+Node: Interface\7f127257
+Node: Parser Function\7f128120
+Node: Lexical\7f128955
+Node: Calling Convention\7f130361
+Node: Token Values\7f133132
+Node: Token Positions\7f134281
+Node: Pure Calling\7f135166
+Node: Error Reporting\7f138098
+Node: Action Features\7f140220
+Node: Algorithm\7f143515
+Node: Look-Ahead\7f145808
+Node: Shift/Reduce\7f147940
+Node: Precedence\7f150852
+Node: Why Precedence\7f151503
+Node: Using Precedence\7f153368
+Node: Precedence Examples\7f154336
+Node: How Precedence\7f155037
+Node: Contextual Precedence\7f156186
+Node: Parser States\7f157977
+Node: Reduce/Reduce\7f159220
+Node: Mystery Conflicts\7f162781
+Node: Stack Overflow\7f166167
+Node: Error Recovery\7f167540
+Node: Context Dependency\7f172676
+Node: Semantic Tokens\7f173524
+Node: Lexical Tie-ins\7f176541
+Node: Tie-in Recovery\7f178055
+Node: Debugging\7f180227
+Node: Invocation\7f183478
+Node: Bison Options\7f184730
+Node: Environment Variables\7f188164
+Node: Option Cross Key\7f189012
+Node: VMS Invocation\7f189856
+Node: Table of Symbols\7f190640
+Node: Glossary\7f198241
+Node: Copying This Manual\7f204545
+Node: GNU Free Documentation License\7f204754
+Node: Index\7f224619

 \1f
 End Tag Table
 \1f
 End Tag Table

diff --git a/doc/bison.info-1 b/doc/bison.info-1
index 341a38ed57a74fe1a5910b19de1edc76bf04d8dc..154f407020accaf08f6de9a9b9de8cf934cdc144 100644 (file)
--- a/doc/bison.info-1
+++ b/doc/bison.info-1
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -87,7 +87,7 @@ Examples
 
 Reverse Polish Notation Calculator
 
 
 Reverse Polish Notation Calculator
 

-* Decls: Rpcalc Decls.  Bison and C declarations for rpcalc.
+* Decls: Rpcalc Decls.  Prologue (declarations) for rpcalc.

 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.
 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.


@@ -119,10 +119,10 @@ Bison Grammar Files
 
 Outline of a Bison Grammar
 
 
 Outline of a Bison Grammar
 

-* C Declarations::    Syntax and usage of the C declarations section.
+* Prologue::          Syntax and usage of the prologue (declarations section).

 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.
 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.

-* C Code::            Syntax and usage of the additional C code section.
+* Epilogue::          Syntax and usage of the epilogue (additional code section).

 
 Defining Language Semantics
 
 
 Defining Language Semantics
 


@@ -981,7 +981,7 @@ The Overall Layout of a Bison Grammar
 general form of a Bison grammar file is as follows:
 
      %{
 general form of a Bison grammar file is as follows:
 
      %{

-     C DECLARATIONS
+     PROLOGUE (DECLARATIONS)

      %}
      
      BISON DECLARATIONS
      %}
      
      BISON DECLARATIONS


@@ -989,15 +989,14 @@ general form of a Bison grammar file is as follows:
      %%
      GRAMMAR RULES
      %%
      %%
      GRAMMAR RULES
      %%

-     ADDITIONAL C CODE
+     EPILOGUE (ADDITIONAL CODE)

 
 The `%%', `%{' and `%}' are punctuation that appears in every Bison
 grammar file to separate the sections.
 
 
 The `%%', `%{' and `%}' are punctuation that appears in every Bison
 grammar file to separate the sections.
 

-   The C declarations may define types and variables used in the
-actions.  You can also use preprocessor commands to define macros used
-there, and use `#include' to include header files that do any of these
-things.
+   The prologue may define types and variables used in the actions. You
+can also use preprocessor commands to define macros used there, and use
+`#include' to include header files that do any of these things.

 
    The Bison declarations declare the names of the terminal and
 nonterminal symbols, and may also describe operator precedence and the
 
    The Bison declarations declare the names of the terminal and
 nonterminal symbols, and may also describe operator precedence and the


@@ -1006,10 +1005,10 @@ data types of semantic values of various symbols.
    The grammar rules define how to construct each nonterminal symbol
 from its parts.
 
    The grammar rules define how to construct each nonterminal symbol
 from its parts.
 

-   The additional C code can contain any C code you want to use.  Often
-the definition of the lexical analyzer `yylex' goes here, plus
-subroutines called by the actions in the grammar rules.  In a simple
-program, all the rest of the program can go here.
+   The epilogue can contain any code you want to use. Often the
+definition of the lexical analyzer `yylex' goes here, plus subroutines
+called by the actions in the grammar rules.  In a simple program, all
+the rest of the program can go here.

 
 \1f
 File: bison.info,  Node: Examples,  Next: Grammar File,  Prev: Concepts,  Up: Top
 
 \1f
 File: bison.info,  Node: Examples,  Next: Grammar File,  Prev: Concepts,  Up: Top


@@ -1055,7 +1054,7 @@ extension is a convention used for Bison input files.
 
 * Menu:
 
 
 * Menu:
 

-* Decls: Rpcalc Decls.  Bison and C declarations for rpcalc.
+* Decls: Rpcalc Decls.  Prologue (declarations) for rpcalc.

 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.
 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.

diff --git a/doc/bison.info-2 b/doc/bison.info-2
index 21b3e2df903a727fd379be0364b359a25050ed02..7a4833bbffd4d6b671ed53c877dce3416d5698fe 100644 (file)
--- a/doc/bison.info-2
+++ b/doc/bison.info-2
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -48,8 +48,8 @@ calculator.  As in C, comments are placed between `/*...*/'.
      
      %% /* Grammar rules and actions follow */
 
      
      %% /* Grammar rules and actions follow */
 

-   The C declarations section (*note The C Declarations Section: C
-Declarations.) contains two preprocessor directives.
+   The declarations section (*note The prologue: Prologue.) contains two
+preprocessor directives.

 
    The `#define' directive defines the macro `YYSTYPE', thus specifying
 the C data type for semantic values of both tokens and groupings (*note
 
    The `#define' directive defines the macro `YYSTYPE', thus specifying
 the C data type for semantic values of both tokens and groupings (*note


@@ -359,8 +359,8 @@ Running Bison to Make the Parser
 arrange all the source code in one or more source files.  For such a
 simple example, the easiest thing is to put everything in one file.  The
 definitions of `yylex', `yyerror' and `main' go at the end, in the
 arrange all the source code in one or more source files.  For such a
 simple example, the easiest thing is to put everything in one file.  The
 definitions of `yylex', `yyerror' and `main' go at the end, in the

-"additional C code" section of the file (*note The Overall Layout of a
-Bison Grammar: Grammar Layout.).
+epilogue of the file (*note The Overall Layout of a Bison Grammar:
+Grammar Layout.).

 
    For a large project, you would probably have several source files,
 and use `make' to arrange to recompile them.
 
    For a large project, you would probably have several source files,
 and use `make' to arrange to recompile them.


@@ -926,7 +926,7 @@ Outline of a Bison Grammar
 appropriate delimiters:
 
      %{
 appropriate delimiters:
 
      %{

-     C DECLARATIONS
+     PROLOGUE

      %}
      
      BISON DECLARATIONS
      %}
      
      BISON DECLARATIONS


@@ -935,33 +935,33 @@ appropriate delimiters:
      GRAMMAR RULES
      %%
      
      GRAMMAR RULES
      %%
      

-     ADDITIONAL C CODE
+     EPILOGUE

 
    Comments enclosed in `/* ... */' may appear in any of the sections.
 
 * Menu:
 
 
    Comments enclosed in `/* ... */' may appear in any of the sections.
 
 * Menu:
 

-* C Declarations::    Syntax and usage of the C declarations section.
+* Prologue::          Syntax and usage of the prologue.

 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.
 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.

-* C Code::            Syntax and usage of the additional C code section.
+* Epilogue::          Syntax and usage of the epilogue.

 
 \1f
 
 \1f

-File: bison.info,  Node: C Declarations,  Next: Bison Declarations,  Up: Grammar Outline
+File: bison.info,  Node: Prologue,  Next: Bison Declarations,  Up: Grammar Outline

 
 

-The C Declarations Section
---------------------------
+The prologue
+------------

 
 

-   The C DECLARATIONS section contains macro definitions and
-declarations of functions and variables that are used in the actions in
-the grammar rules.  These are copied to the beginning of the parser
-file so that they precede the definition of `yyparse'.  You can use
-`#include' to get the declarations from a header file.  If you don't
-need any C declarations, you may omit the `%{' and `%}' delimiters that
-bracket this section.
+   The PROLOGUE section contains macro definitions and declarations of
+functions and variables that are used in the actions in the grammar
+rules.  These are copied to the beginning of the parser file so that
+they precede the definition of `yyparse'.  You can use `#include' to
+get the declarations from a header file.  If you don't need any C
+declarations, you may omit the `%{' and `%}' delimiters that bracket
+this section.

 
 \1f
 
 \1f

-File: bison.info,  Node: Bison Declarations,  Next: Grammar Rules,  Prev: C Declarations,  Up: Grammar Outline
+File: bison.info,  Node: Bison Declarations,  Next: Grammar Rules,  Prev: Prologue,  Up: Grammar Outline

 
 The Bison Declarations Section
 ------------------------------
 
 The Bison Declarations Section
 ------------------------------


@@ -972,7 +972,7 @@ some simple grammars you may not need any declarations.  *Note Bison
 Declarations: Declarations.
 
 \1f
 Declarations: Declarations.
 
 \1f

-File: bison.info,  Node: Grammar Rules,  Next: C Code,  Prev: Bison Declarations,  Up: Grammar Outline
+File: bison.info,  Node: Grammar Rules,  Next: Epilogue,  Prev: Bison Declarations,  Up: Grammar Outline

 
 The Grammar Rules Section
 -------------------------
 
 The Grammar Rules Section
 -------------------------


@@ -985,17 +985,17 @@ rules, and nothing else.  *Note Syntax of Grammar Rules: Rules.
 the first thing in the file.
 
 \1f
 the first thing in the file.
 
 \1f

-File: bison.info,  Node: C Code,  Prev: Grammar Rules,  Up: Grammar Outline
+File: bison.info,  Node: Epilogue,  Prev: Grammar Rules,  Up: Grammar Outline

 
 

-The Additional C Code Section
------------------------------
+The epilogue
+------------

 
 

-   The ADDITIONAL C CODE section is copied verbatim to the end of the
-parser file, just as the C DECLARATIONS section is copied to the
-beginning.  This is the most convenient place to put anything that you
-want to have in the parser file but which need not come before the
-definition of `yyparse'.  For example, the definitions of `yylex' and
-`yyerror' often go here.  *Note Parser C-Language Interface: Interface.
+   The EPILOGUE is copied verbatim to the end of the parser file, just
+as the PROLOGUE is copied to the beginning.  This is the most convenient
+place to put anything that you want to have in the parser file but
+which need not come before the definition of `yyparse'.  For example,
+the definitions of `yylex' and `yyerror' often go here.  *Note Parser
+C-Language Interface: Interface.

 
    If the last section is empty, you may omit the `%%' that separates it
 from the grammar rules.
 
    If the last section is empty, you may omit the `%%' that separates it
 from the grammar rules.


@@ -1003,7 +1003,7 @@ from the grammar rules.
    The Bison parser itself contains many static variables whose names
 start with `yy' and many macros whose names start with `YY'.  It is a
 good idea to avoid using any such names (except those documented in this
    The Bison parser itself contains many static variables whose names
 start with `yy' and many macros whose names start with `YY'.  It is a
 good idea to avoid using any such names (except those documented in this

-manual) in the additional C code section of the grammar file.
+manual) in the epilogue of the grammar file.

 
 \1f
 File: bison.info,  Node: Symbols,  Next: Rules,  Prev: Grammar Outline,  Up: Grammar File
 
 \1f
 File: bison.info,  Node: Symbols,  Next: Rules,  Prev: Grammar Outline,  Up: Grammar File


@@ -1256,8 +1256,8 @@ specify some other type, define `YYSTYPE' as a macro, like this:
 
      #define YYSTYPE double
 
 
      #define YYSTYPE double
 

-This macro definition must go in the C declarations section of the
-grammar file (*note Outline of a Bison Grammar: Grammar Outline.).
+This macro definition must go in the prologue of the grammar file
+(*note Outline of a Bison Grammar: Grammar Outline.).

 
 \1f
 File: bison.info,  Node: Multiple Types,  Next: Actions,  Prev: Value Type,  Up: Semantics
 
 \1f
 File: bison.info,  Node: Multiple Types,  Next: Actions,  Prev: Value Type,  Up: Semantics

diff --git a/doc/bison.info-3 b/doc/bison.info-3
index 7640c5c0669388aa67e0ad88f579d2fb156f2410..005040b96da5ba323c1be9475ec9fef5bcdbcb1e 100644 (file)
--- a/doc/bison.info-3
+++ b/doc/bison.info-3
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -746,8 +746,8 @@ that it needs to use.
 
    Keep in mind that the parser uses many C identifiers starting with
 `yy' and `YY' for internal purposes.  If you use such an identifier
 
    Keep in mind that the parser uses many C identifiers starting with
 `yy' and `YY' for internal purposes.  If you use such an identifier

-(aside from those in this manual) in an action or in additional C code
-in the grammar file, you are likely to run into trouble.
+(aside from those in this manual) in an action or in epilogue in the
+grammar file, you are likely to run into trouble.

 
 * Menu:
 
 
 * Menu:
 

diff --git a/doc/bison.info-4 b/doc/bison.info-4
index 1ab7f5cbbbc373543a018c8001df63db275993be..cbd5b239d3f2b19e4824b5f5e8f6bcaa335791a0 100644 (file)
--- a/doc/bison.info-4
+++ b/doc/bison.info-4
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -787,10 +787,9 @@ Here we assume that `yylex' looks at the value of `hexflag'; when it is
 nonzero, all integers are parsed in hexadecimal, and tokens starting
 with letters are parsed as integers if possible.
 
 nonzero, all integers are parsed in hexadecimal, and tokens starting
 with letters are parsed as integers if possible.
 

-   The declaration of `hexflag' shown in the C declarations section of
-the parser file is needed to make it accessible to the actions (*note
-The C Declarations Section: C Declarations.).  You must also write the
-code in `yylex' to obey the flag.
+   The declaration of `hexflag' shown in the prologue of the parser file
+is needed to make it accessible to the actions (*note The Prologue:
+Prologue.).  You must also write the code in `yylex' to obey the flag.

 
 \1f
 File: bison.info,  Node: Tie-in Recovery,  Prev: Lexical Tie-ins,  Up: Context Dependency
 
 \1f
 File: bison.info,  Node: Tie-in Recovery,  Prev: Lexical Tie-ins,  Up: Context Dependency


@@ -859,15 +858,13 @@ out why.
 
    To enable compilation of trace facilities, you must define the macro
 `YYDEBUG' when you compile the parser.  You could use `-DYYDEBUG=1' as
 
    To enable compilation of trace facilities, you must define the macro
 `YYDEBUG' when you compile the parser.  You could use `-DYYDEBUG=1' as

-a compiler option or you could put `#define YYDEBUG 1' in the C
-declarations section of the grammar file (*note The C Declarations
-Section: C Declarations.).  Alternatively, use the `-t' option when you
-run Bison (*note Invoking Bison: Invocation.).  We always define
-`YYDEBUG' so that debugging is always possible.
+a compiler option or you could put `#define YYDEBUG 1' in the prologue
+of the grammar file (*note The Prologue: Prologue.). Alternatively, use
+the `-t' option when you run Bison (*note Invoking Bison: Invocation.).
+We always define `YYDEBUG' so that debugging is always possible.

 
    The trace facility uses `stderr', so you must add
 
    The trace facility uses `stderr', so you must add

-`#include <stdio.h>' to the C declarations section unless it is already
-there.
+`#include <stdio.h>' to the prologue unless it is already there.

 
    Once you have compiled the program with trace facilities, the way to
 request a trace is to store a nonzero value in the variable `yydebug'.
 
    Once you have compiled the program with trace facilities, the way to
 request a trace is to store a nonzero value in the variable `yydebug'.

diff --git a/doc/bison.info-5 b/doc/bison.info-5
index 965c6fac63166a793b2a4ecc5693f51b3e7fc697..097fc9dbd9f0bd689226ca3280873051aa1ab786 100644 (file)
--- a/doc/bison.info-5
+++ b/doc/bison.info-5
@@ -1,5 +1,5 @@
-Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-à partir bison.texinfo.
+This is bison.info, produced by makeinfo version 4.0b from
+bison.texinfo.

 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).
 
 START-INFO-DIR-ENTRY
 * bison: (bison).      GNU Project parser generator (yacc replacement).


@@ -220,14 +220,13 @@ Bison Symbols
 
 `%%'
      Delimiter used to separate the grammar rule section from the Bison
 
 `%%'
      Delimiter used to separate the grammar rule section from the Bison

-     declarations section or the additional C code section.  *Note The
-     Overall Layout of a Bison Grammar: Grammar Layout.
+     declarations section or the epilogue.  *Note The Overall Layout of
+     a Bison Grammar: Grammar Layout.

 
 `%{ %}'
      All code listed between `%{' and `%}' is copied directly to the
 
 `%{ %}'
      All code listed between `%{' and `%}' is copied directly to the

-     output file uninterpreted.  Such code forms the "C declarations"
-     section of the input file.  *Note Outline of a Bison Grammar:
-     Grammar Outline.
+     output file uninterpreted.  Such code forms the prologue of the
+     input file.  *Note Outline of a Bison Grammar: Grammar Outline.

 
 `/*...*/'
      Comment delimiters, as in C.
 
 `/*...*/'
      Comment delimiters, as in C.


@@ -824,17 +823,17 @@ Index
 * %token:                                Token Decl.
 * %type:                                 Type Decl.
 * %union:                                Union Decl.
 * %token:                                Token Decl.
 * %type:                                 Type Decl.
 * %union:                                Union Decl.

-* @$ <1>:                                Action Features.
-* @$:                                    Actions and Locations.
-* @N <1>:                                Action Features.
-* @N:                                    Actions and Locations.
+* @$ <1>:                                Actions and Locations.
+* @$:                                    Action Features.
+* @N <1>:                                Actions and Locations.
+* @N:                                    Action Features.

 * action:                                Actions.
 * action data types:                     Action Types.
 * action features summary:               Action Features.
 * actions in mid-rule:                   Mid-Rule Actions.
 * actions, location:                     Actions and Locations.
 * actions, semantic:                     Semantic Actions.
 * action:                                Actions.
 * action data types:                     Action Types.
 * action features summary:               Action Features.
 * actions in mid-rule:                   Mid-Rule Actions.
 * actions, location:                     Actions and Locations.
 * actions, semantic:                     Semantic Actions.

-* additional C code section:             C Code.
+* additional C code section:             Epilogue.

 * algorithm of parser:                   Algorithm.
 * associativity:                         Why Precedence.
 * Backus-Naur form:                      Language and Grammar.
 * algorithm of parser:                   Algorithm.
 * associativity:                         Why Precedence.
 * Backus-Naur form:                      Language and Grammar.


@@ -850,8 +849,7 @@ Index
 * BISON_HAIRY:                           Environment Variables.
 * BISON_SIMPLE:                          Environment Variables.
 * BNF:                                   Language and Grammar.
 * BISON_HAIRY:                           Environment Variables.
 * BISON_SIMPLE:                          Environment Variables.
 * BNF:                                   Language and Grammar.

-* C code, section for additional:        C Code.
-* C declarations section:                C Declarations.
+* C code, section for additional:        Epilogue.

 * C-language interface:                  Interface.
 * calc:                                  Infix Calc.
 * calculator, infix notation:            Infix Calc.
 * C-language interface:                  Interface.
 * calc:                                  Infix Calc.
 * calculator, infix notation:            Infix Calc.


@@ -871,9 +869,10 @@ Index
 * data types of semantic values:         Value Type.
 * debugging:                             Debugging.
 * declaration summary:                   Decl Summary.
 * data types of semantic values:         Value Type.
 * debugging:                             Debugging.
 * declaration summary:                   Decl Summary.

+* declarations:                          Prologue.
+* declarations section:                  Prologue.

 * declarations, Bison:                   Declarations.
 * declarations, Bison (introduction):    Bison Declarations.
 * declarations, Bison:                   Declarations.
 * declarations, Bison (introduction):    Bison Declarations.

-* declarations, C:                       C Declarations.

 * declaring literal string tokens:       Token Decl.
 * declaring operator precedence:         Precedence Decl.
 * declaring the start symbol:            Start Decl.
 * declaring literal string tokens:       Token Decl.
 * declaring operator precedence:         Precedence Decl.
 * declaring the start symbol:            Start Decl.


@@ -888,6 +887,7 @@ Index
 * defining language semantics:           Semantics.
 * else, dangling:                        Shift/Reduce.
 * environment variables:                 Environment Variables.
 * defining language semantics:           Semantics.
 * else, dangling:                        Shift/Reduce.
 * environment variables:                 Environment Variables.

+* epilogue:                              Epilogue.

 * error:                                 Error Recovery.
 * error recovery:                        Error Recovery.
 * error recovery, simple:                Simple Error Recovery.
 * error:                                 Error Recovery.
 * error recovery:                        Error Recovery.
 * error recovery, simple:                Simple Error Recovery.


@@ -944,13 +944,14 @@ Index
 * parser stack overflow:                 Stack Overflow.
 * parser state:                          Parser States.
 * polish notation calculator:            RPN Calc.
 * parser stack overflow:                 Stack Overflow.
 * parser state:                          Parser States.
 * polish notation calculator:            RPN Calc.

-* position, textual <1>:                 Locations.
-* position, textual:                     Locations Overview.
+* position, textual <1>:                 Locations Overview.
+* position, textual:                     Locations.

 * precedence declarations:               Precedence Decl.
 * precedence of operators:               Precedence.
 * precedence, context-dependent:         Contextual Precedence.
 * precedence, unary operator:            Contextual Precedence.
 * preventing warnings about conflicts:   Expect Decl.
 * precedence declarations:               Precedence Decl.
 * precedence of operators:               Precedence.
 * precedence, context-dependent:         Contextual Precedence.
 * precedence, unary operator:            Contextual Precedence.
 * preventing warnings about conflicts:   Expect Decl.

+* Prologue:                              Prologue.

 * pure parser:                           Pure Decl.
 * recovery from errors:                  Error Recovery.
 * recursive rule:                        Recursion.
 * pure parser:                           Pure Decl.
 * recovery from errors:                  Error Recovery.
 * recursive rule:                        Recursion.


@@ -1008,8 +1009,8 @@ Index
 * YYBACKUP:                              Action Features.
 * yychar:                                Look-Ahead.
 * yyclearin:                             Error Recovery.
 * YYBACKUP:                              Action Features.
 * yychar:                                Look-Ahead.
 * yyclearin:                             Error Recovery.

-* yydebug:                               Debugging.

 * YYDEBUG:                               Debugging.
 * YYDEBUG:                               Debugging.

+* yydebug:                               Debugging.

 * YYEMPTY:                               Action Features.
 * yyerrok:                               Error Recovery.
 * YYERROR:                               Action Features.
 * YYEMPTY:                               Action Features.
 * yyerrok:                               Error Recovery.
 * YYERROR:                               Action Features.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 3de218ee8a9984048860f8c612209ffe5d54bbcb..dda51a4d685bc86c04c92350c4d86c7ab6e0799e 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

 
 

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.


@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 

+@SET_MAKE@

 
 SHELL = @SHELL@
 
 
 SHELL = @SHELL@
 


@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include

-
-DESTDIR =
-

 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@

-

 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@


@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@

-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

+INSTALL_HEADER = $(INSTALL_DATA)

 transform = @program_transform_name@
 transform = @program_transform_name@

-

 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :


@@ -59,20 +57,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@

+AMTAR = @AMTAR@

 AT_TESTPATH = @AT_TESTPATH@
 AT_TESTPATH = @AT_TESTPATH@

+AWK = @AWK@

 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@

+DEPDIR = @DEPDIR@

 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@

+EXEEXT = @EXEEXT@

 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@

+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@


@@ -81,9 +84,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@

-MAKEINFO = @MAKEINFO@

 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@

+OBJEXT = @OBJEXT@

 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@


@@ -93,6 +96,9 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@

+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 
 AUTOMAKE_OPTIONS = ansi2knr
 
 
 AUTOMAKE_OPTIONS = ansi2knr
 


@@ -100,302 +106,300 @@ noinst_LIBRARIES = libbison.a
 
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -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...
 # Heck, we are still using an old version of Automake which does not
 # understand LIBOBJ additions using $objext...

-

 EXTRA_DIST = malloc.c realloc.c
 
 EXTRA_DIST = malloc.c realloc.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_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@
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
 
 
 libbison_a_LIBADD = @LIBOBJS@
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)

+subdir = lib

 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+
+libbison_a_AR = $(AR) cru
+am_libbison_a_OBJECTS = error$U.$(OBJEXT) getopt$U.$(OBJEXT) \
+       getopt1$U.$(OBJEXT) hash$U.$(OBJEXT) obstack$U.$(OBJEXT) \
+       quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+       xstrdup$U.$(OBJEXT)
+libbison_a_OBJECTS = $(am_libbison_a_OBJECTS)
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)

 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@

-ANSI2KNR = @ANSI2KNR@
-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)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/error$U.Po $(DEPDIR)/getopt$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/getopt1$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/malloc.Po $(DEPDIR)/memchr.Po \
+@AMDEP_TRUE@   $(DEPDIR)/obstack$U.Po $(DEPDIR)/quote$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/quotearg$U.Po $(DEPDIR)/realloc.Po \
+@AMDEP_TRUE@   $(DEPDIR)/stpcpy.Po $(DEPDIR)/strndup.Po \
+@AMDEP_TRUE@   $(DEPDIR)/strnlen.Po $(DEPDIR)/strspn.Po \
+@AMDEP_TRUE@   $(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)
 CCLD = $(CC)

-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c memchr.c \
-stpcpy.c strndup.c strnlen.c strspn.c
-
-
-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/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
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(libbison_a_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c malloc.c \
+       memchr.c realloc.c stpcpy.c strndup.c strnlen.c strspn.c

 SOURCES = $(libbison_a_SOURCES)
 SOURCES = $(libbison_a_SOURCES)

-OBJECTS = $(libbison_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile

 
 

-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+all: all-am

 
 

+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  lib/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && \
+         CONFIG_HEADERS= CONFIG_LINKS= \
+         CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

 
 

-mostlyclean-noinstLIBRARIES:
+AR = ar

 
 clean-noinstLIBRARIES:
        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
 clean-noinstLIBRARIES:
        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)

-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.s.o:
-       $(COMPILE) -c $<
-
-.S.o:
-       $(COMPILE) -c $<
+libbison.a: $(libbison_a_OBJECTS) $(libbison_a_DEPENDENCIES) 
+       -rm -f libbison.a
+       $(libbison_a_AR) libbison.a $(libbison_a_OBJECTS) $(libbison_a_LIBADD)
+       $(RANLIB) libbison.a

 
 mostlyclean-compile:
 
 mostlyclean-compile:

-       -rm -f *.o core *.core
-
-clean-compile:
+       -rm -f *.$(OBJEXT) core *.core

 
 distclean-compile:
        -rm -f *.tab.c
 
 
 distclean-compile:
        -rm -f *.tab.c
 

-maintainer-clean-compile:
-
-mostlyclean-krextra:
+ANSI2KNR = @ANSI2KNR@
+ansi2knr: ansi2knr.$(OBJEXT)
+       $(LINK) ansi2knr.$(OBJEXT) $(LIBS)
+ansi2knr.$(OBJEXT): $(CONFIG_HEADER)

 
 clean-krextra:
        -rm -f ansi2knr
 
 
 clean-krextra:
        -rm -f ansi2knr
 

-distclean-krextra:
-
-maintainer-clean-krextra:
-ansi2knr: ansi2knr.o
-       $(LINK) ansi2knr.o $(LIBS)
-ansi2knr.o: $(CONFIG_HEADER)
-
-

 mostlyclean-kr:
        -rm -f *_.c
 
 mostlyclean-kr:
        -rm -f *_.c
 

-clean-kr:
-
-distclean-kr:
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memchr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quote$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quotearg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strspn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xmalloc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrdup$U.Po@am__quote@

 
 

-maintainer-clean-kr:
-
-libbison.a: $(libbison_a_OBJECTS) $(libbison_a_DEPENDENCIES)
-       -rm -f libbison.a
-       $(AR) cru libbison.a $(libbison_a_OBJECTS) $(libbison_a_LIBADD)
-       $(RANLIB) libbison.a
+distclean-depend:
+       -rm -rf $(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@

 alloca_.c: alloca.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f alloca_.c

 error_.c: error.c $(ANSI2KNR)
 error_.c: error.c $(ANSI2KNR)

-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c || rm -f error_.c

 getopt_.c: getopt.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f getopt_.c

 getopt1_.c: getopt1.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f getopt1_.c

 hash_.c: hash.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f hash_.c
+malloc_.c: malloc.c $(ANSI2KNR)
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/malloc.c; then echo $(srcdir)/malloc.c; else echo malloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > malloc_.c || rm -f malloc_.c

 memchr_.c: memchr.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f memchr_.c

 obstack_.c: obstack.c $(ANSI2KNR)
 obstack_.c: obstack.c $(ANSI2KNR)

-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c || rm -f obstack_.c

 quote_.c: quote.c $(ANSI2KNR)
 quote_.c: quote.c $(ANSI2KNR)

-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c || rm -f quote_.c

 quotearg_.c: quotearg.c $(ANSI2KNR)
 quotearg_.c: quotearg.c $(ANSI2KNR)

-       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c || rm -f quotearg_.c
+realloc_.c: realloc.c $(ANSI2KNR)
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/realloc.c; then echo $(srcdir)/realloc.c; else echo realloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > realloc_.c || rm -f realloc_.c

 stpcpy_.c: stpcpy.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f stpcpy_.c

 strndup_.c: strndup.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f strndup_.c

 strnlen_.c: strnlen.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f strnlen_.c

 strspn_.c: strspn.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f strspn_.c

 xmalloc_.c: xmalloc.c $(ANSI2KNR)
 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
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f xmalloc_.c

 xstrdup_.c: xstrdup.c $(ANSI2KNR)
 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 hash_.o memchr_.o obstack_.o \
-quote_.o quotearg_.o stpcpy_.o strndup_.o strnlen_.o strspn_.o \
-xmalloc_.o xstrdup_.o : $(ANSI2KNR)
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f xstrdup_.c
+alloca_.$(OBJEXT) error_.$(OBJEXT) getopt_.$(OBJEXT) getopt1_.$(OBJEXT) \
+hash_.$(OBJEXT) malloc_.$(OBJEXT) memchr_.$(OBJEXT) obstack_.$(OBJEXT) \
+quote_.$(OBJEXT) quotearg_.$(OBJEXT) realloc_.$(OBJEXT) \
+stpcpy_.$(OBJEXT) strndup_.$(OBJEXT) strnlen_.$(OBJEXT) \
+strspn_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:

 
 tags: TAGS
 
 
 tags: TAGS
 

-ID: $(HEADERS) $(SOURCES) $(LISP)
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
-         awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \

               END { for (i in files) print i; }'`; \
               END { for (i in files) print i; }'`; \

-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $$unique $(LISP)
+       mkid -fID $$unique $(LISP)

 
 

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)

        tags=; \
        here=`pwd`; \
        tags=; \
        here=`pwd`; \

-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
-         awk '    { files[$$0] = 1; } \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \

               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \

-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+         || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

 
 

-clean-tags:
+GTAGS:
+       here=`CDPATH=: && cd $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here

 
 distclean-tags:
 
 distclean-tags:

-       -rm -f TAGS ID
-
-maintainer-clean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH

 
 

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 
 

-subdir = lib
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 
 distdir: $(DISTFILES)
 
 distdir: $(DISTFILES)

-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       distdir=`cd $(distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile

        @for file in $(DISTFILES); do \
        @for file in $(DISTFILES); do \

-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           $(mkinstalldirs) "$(distdir)/$$dir"; \
+         fi; \

          if test -d $$d/$$file; then \
          if test -d $$d/$$file; then \

-           cp -pr $$d/$$file $(distdir)/$$file; \
+           cp -pR $$d/$$file $(distdir) \
+           || exit 1; \

          else \
            test -f $(distdir)/$$file \
          else \
            test -f $(distdir)/$$file \

-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \

          fi; \
        done
          fi; \
        done

-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-       -rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-       @echo '$(COMPILE) -c $<'; \
-       $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-       @-cp .deps/$(*F).pp .deps/$(*F).P; \
-       tr ' ' '\012' < .deps/$(*F).pp \
-         | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-           >> .deps/$(*F).P; \
-       rm .deps/$(*F).pp
-
-%.lo: %.c
-       @echo '$(LTCOMPILE) -c $<'; \
-       $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-       @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
-         < .deps/$(*F).pp > .deps/$(*F).P; \
-       tr ' ' '\012' < .deps/$(*F).pp \
-         | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-           >> .deps/$(*F).P; \
-       rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am

 check-am: all-am
 check: check-am
 check-am: all-am
 check: check-am

-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(ANSI2KNR) $(LIBRARIES)

 
 

-install-data-am:
-install-data: install-data-am
+installdirs:

 
 

-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 install: install-am
 install: install-am

-uninstall-am:
+install-exec: install-exec-am
+install-data: install-data-am

 uninstall: uninstall-am
 uninstall: uninstall-am

-all-am: Makefile $(ANSI2KNR) $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:

 
 

+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 
 

+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:

-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 
 maintainer-clean-generic:
 
 maintainer-clean-generic:

-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-               mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
-               mostlyclean-depend mostlyclean-generic
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am

 
 

-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-krextra clean-noinstLIBRARIES \
+       mostlyclean-am

 
 

-clean-am:  clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
-               clean-tags clean-depend clean-generic mostlyclean-am
+distclean: distclean-am

 
 

-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+       distclean-generic distclean-tags

 
 

-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-               distclean-krextra distclean-kr distclean-tags \
-               distclean-depend distclean-generic clean-am
+dvi: dvi-am

 
 

-distclean: distclean-am
+dvi-am:

 
 

-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-               maintainer-clean-compile maintainer-clean-krextra \
-               maintainer-clean-kr maintainer-clean-tags \
-               maintainer-clean-depend maintainer-clean-generic \
-               distclean-am
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:

 
 maintainer-clean: maintainer-clean-am
 
 
 maintainer-clean: maintainer-clean-am
 

-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-krextra distclean-krextra \
-clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
-clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-info-am

 
 

+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+       clean-krextra clean-noinstLIBRARIES distclean distclean-compile \
+       distclean-depend distclean-generic distclean-tags distdir dvi \
+       dvi-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+       uninstall-info-am

 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/src/Makefile.in b/src/Makefile.in
index 424f2bffca6c79d165b2f9fa8e9fb6a2a45b2666..e1c32716203b51ac1858c0dcd5cee7d07f04acee 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -116,7 +116,7 @@ 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_graph.c \
     derives.c  \
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
     output.c print_graph.c \

-    muscle_tab.c       \
+    muscle_tab.c options.c \

     print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 
     print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 


@@ -126,7 +126,7 @@ 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 print_graph.h        \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
  output.h print_graph.h        \

- muscle_tab.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
 
  print.h reader.h reduce.h state.h symtab.h warshall.h system.h \
  types.h vcg.h vcg_defaults.h
 


@@ -146,9 +146,9 @@ am_bison_OBJECTS = LR0$U.$(OBJEXT) closure$U.$(OBJEXT) \
        files$U.$(OBJEXT) getargs$U.$(OBJEXT) gram$U.$(OBJEXT) \
        lalr$U.$(OBJEXT) lex$U.$(OBJEXT) main$U.$(OBJEXT) \
        nullable$U.$(OBJEXT) output$U.$(OBJEXT) print_graph$U.$(OBJEXT) \
        files$U.$(OBJEXT) getargs$U.$(OBJEXT) gram$U.$(OBJEXT) \
        lalr$U.$(OBJEXT) lex$U.$(OBJEXT) main$U.$(OBJEXT) \
        nullable$U.$(OBJEXT) output$U.$(OBJEXT) print_graph$U.$(OBJEXT) \

-       muscle_tab$U.$(OBJEXT) print$U.$(OBJEXT) reader$U.$(OBJEXT) \
-       reduce$U.$(OBJEXT) symtab$U.$(OBJEXT) warshall$U.$(OBJEXT) \
-       vcg$U.$(OBJEXT)
+       muscle_tab$U.$(OBJEXT) options$U.$(OBJEXT) print$U.$(OBJEXT) \
+       reader$U.$(OBJEXT) reduce$U.$(OBJEXT) symtab$U.$(OBJEXT) \
+       warshall$U.$(OBJEXT) vcg$U.$(OBJEXT)

 bison_OBJECTS = $(am_bison_OBJECTS)
 bison_LDADD = $(LDADD)
 bison_DEPENDENCIES = ../lib/libbison.a
 bison_OBJECTS = $(am_bison_OBJECTS)
 bison_LDADD = $(LDADD)
 bison_DEPENDENCIES = ../lib/libbison.a


@@ -164,11 +164,12 @@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 @AMDEP_TRUE@   $(DEPDIR)/getargs$U.Po $(DEPDIR)/gram$U.Po \
 @AMDEP_TRUE@   $(DEPDIR)/lalr$U.Po $(DEPDIR)/lex$U.Po \
 @AMDEP_TRUE@   $(DEPDIR)/main$U.Po $(DEPDIR)/muscle_tab$U.Po \
 @AMDEP_TRUE@   $(DEPDIR)/getargs$U.Po $(DEPDIR)/gram$U.Po \
 @AMDEP_TRUE@   $(DEPDIR)/lalr$U.Po $(DEPDIR)/lex$U.Po \
 @AMDEP_TRUE@   $(DEPDIR)/main$U.Po $(DEPDIR)/muscle_tab$U.Po \

-@AMDEP_TRUE@   $(DEPDIR)/nullable$U.Po $(DEPDIR)/output$U.Po \
-@AMDEP_TRUE@   $(DEPDIR)/print$U.Po $(DEPDIR)/print_graph$U.Po \
-@AMDEP_TRUE@   $(DEPDIR)/reader$U.Po $(DEPDIR)/reduce$U.Po \
-@AMDEP_TRUE@   $(DEPDIR)/symtab$U.Po $(DEPDIR)/vcg$U.Po \
-@AMDEP_TRUE@   $(DEPDIR)/vmsgetargs$U.Po $(DEPDIR)/warshall$U.Po
+@AMDEP_TRUE@   $(DEPDIR)/nullable$U.Po $(DEPDIR)/options$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/output$U.Po $(DEPDIR)/print$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/print_graph$U.Po $(DEPDIR)/reader$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/reduce$U.Po $(DEPDIR)/symtab$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/vcg$U.Po $(DEPDIR)/vmsgetargs$U.Po \
+@AMDEP_TRUE@   $(DEPDIR)/warshall$U.Po

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)


@@ -246,6 +247,7 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/muscle_tab$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nullable$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/muscle_tab$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nullable$U.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/options$U.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/output$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print_graph$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/output$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print_graph$U.Po@am__quote@


@@ -297,6 +299,8 @@ muscle_tab_.c: muscle_tab.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/muscle_tab.c; then echo $(srcdir)/muscle_tab.c; else echo muscle_tab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > muscle_tab_.c || rm -f muscle_tab_.c
 nullable_.c: nullable.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f nullable_.c
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/muscle_tab.c; then echo $(srcdir)/muscle_tab.c; else echo muscle_tab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > muscle_tab_.c || rm -f muscle_tab_.c
 nullable_.c: nullable.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(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 || rm -f nullable_.c

+options_.c: options.c $(ANSI2KNR)
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/options.c; then echo $(srcdir)/options.c; else echo options.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > options_.c || rm -f options_.c

 output_.c: output.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/output.c; then echo $(srcdir)/output.c; else echo output.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > output_.c || rm -f output_.c
 print_.c: print.c $(ANSI2KNR)
 output_.c: output.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/output.c; then echo $(srcdir)/output.c; else echo output.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > output_.c || rm -f output_.c
 print_.c: print.c $(ANSI2KNR)


@@ -319,9 +323,10 @@ LR0_.$(OBJEXT) closure_.$(OBJEXT) complain_.$(OBJEXT) \
 conflicts_.$(OBJEXT) derives_.$(OBJEXT) files_.$(OBJEXT) \
 getargs_.$(OBJEXT) gram_.$(OBJEXT) lalr_.$(OBJEXT) lex_.$(OBJEXT) \
 main_.$(OBJEXT) muscle_tab_.$(OBJEXT) nullable_.$(OBJEXT) \
 conflicts_.$(OBJEXT) derives_.$(OBJEXT) files_.$(OBJEXT) \
 getargs_.$(OBJEXT) gram_.$(OBJEXT) lalr_.$(OBJEXT) lex_.$(OBJEXT) \
 main_.$(OBJEXT) muscle_tab_.$(OBJEXT) nullable_.$(OBJEXT) \

-output_.$(OBJEXT) print_.$(OBJEXT) print_graph_.$(OBJEXT) \
-reader_.$(OBJEXT) reduce_.$(OBJEXT) symtab_.$(OBJEXT) vcg_.$(OBJEXT) \
-vmsgetargs_.$(OBJEXT) warshall_.$(OBJEXT) : $(ANSI2KNR)
+options_.$(OBJEXT) output_.$(OBJEXT) print_.$(OBJEXT) \
+print_graph_.$(OBJEXT) reader_.$(OBJEXT) reduce_.$(OBJEXT) \
+symtab_.$(OBJEXT) vcg_.$(OBJEXT) vmsgetargs_.$(OBJEXT) \
+warshall_.$(OBJEXT) : $(ANSI2KNR)

 uninstall-info-am:
 install-pkgdataDATA: $(pkgdata_DATA)
        @$(NORMAL_INSTALL)
 uninstall-info-am:
 install-pkgdataDATA: $(pkgdata_DATA)
        @$(NORMAL_INSTALL)