* src/state.h, src/state.c (shift_t, SHIFT_SYMBOL, SHIFT_IS_SHIFT)

[bison.git] / Makefile.maint

diff --git a/Makefile.maint b/Makefile.maint
index c3d8b8c983eaa5d3777b7a4a56091144a65ae3cf..cedb9de3b9eec22c3abe3501539fe1604c5344b8 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -2,6 +2,28 @@
 # This Makefile fragment is shared between fileutils, sh-utils, textutils,
 # CPPI, Bison, and Autoconf.
 
 # This Makefile fragment is shared between fileutils, sh-utils, textutils,
 # CPPI, Bison, and Autoconf.
 

+## Copyright 2001 Free Software Foundation, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+# Do not save the original name or timestamp in the .tar.gz file.
+GZIP_ENV = '--no-name --best'
+
+CVS = cvs
+

 prev_version_file ?= .prev-version
 
 THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))
 prev_version_file ?= .prev-version
 
 THIS_VERSION_REGEXP = $(subst .,\.,$(VERSION))


@@ -21,12 +43,101 @@ release_archive_dir ?= ../release
 
 
 
 
 
 

+## ---------------- ##
+## Updating files.  ##
+## ---------------- ##
+
+WGET = wget
+ftp-gnu = ftp://ftp.gnu.org/gnu
+
+# Use mv, if you don't have/want move-if-change.
+move_if_change ?= move-if-change
+
+# ------------------- #
+# Updating PO files.  #
+# ------------------- #
+
+po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE)
+.PHONY: do-po-update po-update
+do-po-update:
+       tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
+       rm -rf $$tmppo && \
+       mkdir $$tmppo && \
+       (cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
+       cp $$tmppo/*.po po
+       cd po && $(MAKE) update-po
+       $(MAKE) po-check
+
+po-update:
+       if test -d "po"; then \
+         $(MAKE) do-po-update; \
+       fi
+
+# -------------------------- #
+# Updating GNU build tools.  #
+# -------------------------- #
+
+# The following pseudo table associates a local directory and a URL
+# with each of the files that belongs to some other package and is
+# regularly updated from the specified URL.
+wget_files ?= $(srcdir)/config.guess $(srcdir)/config.sub \
+              $(srcdir)/src/ansi2knr.c \
+             $(srcdir)/doc/texinfo.tex
+wget-targets = $(patsubst %, get-%, $(wget_files))
+
+config.guess-url_prefix = $(ftp-gnu)/config/
+config.sub-url_prefix = $(ftp-gnu)/config/
+
+ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
+
+texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
+
+standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+
+target = $(patsubst get-%, %, $@)
+url = $($(notdir $(target))-url_prefix)$(notdir $(target))
+
+.PHONY: $(wget-targets)
+$(wget-targets):
+       $(WGET) $(url) -O $(target).t \
+         && $(move_if_change) $(target).t $(target)
+
+.PHONY: wget-update
+wget-update: $(wget-targets)
+
+
+# Updating tools via CVS.
+cvs_files ?= depcomp missing
+cvs-targets = $(patsubst %, get-%, $(cvs_files))
+
+automake_repo = :pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
+.PHONY: $(cvs-targets)
+$(cvs-targets):
+       $(CVS) -d $(automake_repo) co -p automake/lib/$(notdir $(target)) \
+         >$(target).t \
+           && $(move_if_change) $(target).t $(target);
+
+.PHONY: cvs-update
+cvs-update: $(cvs-targets)
+
+
+# --------------------- #
+# Updating everything.  #
+# --------------------- #
+
+.PHONY: update
+update: wget-update cvs-update po-update
+
+
+

 ## --------------- ##
 ## Sanity checks.  ##
 ## --------------- ##
 
 ## --------------- ##
 ## Sanity checks.  ##
 ## --------------- ##
 

-# Checks that don't require cvs.
-local-check: changelog-check po-check writable-files copyright-check
+# Checks that don't require cvs.  Run `changelog-check' last as
+# previous test may reveal problems requiring new ChangeLog entries.
+local-check: po-check copyright-check writable-files changelog-check

 
 changelog-check:
        if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
 
 changelog-check:
        if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \


@@ -71,13 +182,13 @@ copyright-check:
 # Sanity checks with the CVS repository.
 cvs-tag-check:
        echo $(this-cvs-tag); \
 # Sanity checks with the CVS repository.
 cvs-tag-check:
        echo $(this-cvs-tag); \

-       if cvs -n log -h README | grep -e $(this-cvs-tag): >/dev/null; then \
+       if $(CVS) -n log -h README | grep -e $(this-cvs-tag): >/dev/null; then \

          echo "$(this-cvs-tag) as already been used; not tagging" 1>&2; \
          exit 1; \
        else :; fi
 
 cvs-diff-check:
          echo "$(this-cvs-tag) as already been used; not tagging" 1>&2; \
          exit 1; \
        else :; fi
 
 cvs-diff-check:

-       if cvs diff | grep -v '^?' >cvs-diffs; then             \
+       if $(CVS) diff >cvs-diffs; then                         \

          rm cvs-diffs;                                         \
        else                                                    \
          echo "Some files are locally modified:" 1>&2;         \
          rm cvs-diffs;                                         \
        else                                                    \
          echo "Some files are locally modified:" 1>&2;         \


@@ -92,18 +203,18 @@ maintainer-distcheck: changelog-check
        $(MAKE) my-distcheck
 
 
        $(MAKE) my-distcheck
 
 

-# Do not save the original name or timestamp in the .tar.gz file.
-GZIP_ENV = '--no-name --best'

 
 

-# Automake 1.4 does not define AMTAR.
-AMTAR ?= $(TAR)
+## -------------- ##
+## Making dists.  ##
+## -------------- ##
+

 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
 
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.

-cvs-dist: cvs-check maintainer-distcheck
-       cvs update po
-       cvs tag -c $(this-cvs-tag)
+cvs-dist: local-check cvs-check maintainer-distcheck
+       $(CVS) update po
+       $(CVS) tag -c $(this-cvs-tag)

        $(MAKE) dist
 
 # Use this to make sure we don't run these programs when building
        $(MAKE) dist
 
 # Use this to make sure we don't run these programs when building


@@ -111,6 +222,7 @@ cvs-dist: cvs-check maintainer-distcheck
 null_AM_MAKEFLAGS = \
   ACLOCAL=false \
   AUTOCONF=false \
 null_AM_MAKEFLAGS = \
   ACLOCAL=false \
   AUTOCONF=false \

+  AUTOM4TE=false \

   AUTOMAKE=false \
   AUTOHEADER=false \
   MAKEINFO=false
   AUTOMAKE=false \
   AUTOHEADER=false \
   MAKEINFO=false


@@ -158,7 +270,7 @@ rel-check:
        md5_tmp=/tmp/rel-check-md5-$$$$; \
        set -e; \
        trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
        md5_tmp=/tmp/rel-check-md5-$$$$; \
        set -e; \
        trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \

-       wget -q --output-document=$$tarz $(url); \
+       $(WGET) -q --output-document=$$tarz $(url); \

        echo "$(md5)  -" > $$md5_tmp; \
        md5sum -c $$md5_tmp < $$tarz
 
        echo "$(md5)  -" > $$md5_tmp; \
        md5sum -c $$md5_tmp < $$tarz
 


@@ -203,54 +315,12 @@ announcement: NEWS ChangeLog $(rel-files)
          echo; \
          echo ChangeLog entries:; \
          find . -name ChangeLog -maxdepth 2 \
          echo; \
          echo ChangeLog entries:; \
          find . -name ChangeLog -maxdepth 2 \

-           | xargs cvs diff -up -r$(prev-cvs-tag) -rHEAD \
+           | xargs $(CVS) diff -up -r$(prev-cvs-tag) -rHEAD \

            | sed -n 's/^+//p' \
            | perl -ne 'm!^\+\+ (\./)?! or print,next;' \
              -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
        )
 
            | sed -n 's/^+//p' \
            | perl -ne 'm!^\+\+ (\./)?! or print,next;' \
              -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
        )
 

-WGET = wget
-ftp-gnu = ftp://ftp.gnu.org/gnu
-
-# Use mv, if you don't have/want move-if-change.
-move_if_change ?= move-if-change
-
-# The following pseudo table associates a local directory and a URL
-# with each of the files that belongs to some other package and is
-# regularly updated from the specified URL.
-wget_files ?= $(srcdir)/config.guess $(srcdir)/config.sub \
-              $(srcdir)/src/ansi2knr.c \
-             $(srcdir)/doc/texinfo.tex
-get-targets = $(patsubst %, get-%, $(wget_files))
-
-config.guess-url_prefix = $(ftp-gnu)/config/
-config.sub-url_prefix = $(ftp-gnu)/config/
-
-ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
-
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
-
-standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-
-target = $(patsubst get-%, %, $@)
-url = $($(notdir $(target))-url_prefix)$(notdir $(target))
-
-.PHONY: $(get-targets)
-$(get-targets):
-       $(WGET) $(url) -O $(target).t \
-         && $(move_if_change) $(target).t $(target)
-
-automake_repo=:pserver:anoncvs@anoncvs.cygnus.com:/cvs/automake
-.PHONY: wget-update
-wget-update: $(get-targets)
-       for f in depcomp missing; do                                    \
-         test -f $$f || continue;                                      \
-         echo checking out $$f...;                                     \
-         cvs -d $(automake_repo) co -p automake/lib/$$f > $$f.t        \
-           && $(move_if_change) $$f.t $$f;                             \
-       done
-

 define emit-rsync-commands
        echo =====================================
        echo =====================================
 define emit-rsync-commands
        echo =====================================
        echo =====================================


@@ -265,12 +335,12 @@ endef
 $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
        xdelta delta -9 $^ $@ || :
 
 $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
        xdelta delta -9 $^ $@ || :
 

-alpha: local-check
+alpha:

        $(MAKE) cvs-dist
        $(MAKE) $(xd-delta)
        $(MAKE) -s announcement > /tmp/announce-$(my_distdir)
        ln $(rel-files) $(release_archive_dir)
        chmod a-w $(rel-files)
        echo $(VERSION) > $(prev_version_file)
        $(MAKE) cvs-dist
        $(MAKE) $(xd-delta)
        $(MAKE) -s announcement > /tmp/announce-$(my_distdir)
        ln $(rel-files) $(release_archive_dir)
        chmod a-w $(rel-files)
        echo $(VERSION) > $(prev_version_file)

-       cvs ci -m. $(prev_version_file)
+       $(CVS) ci -m. $(prev_version_file)

        @$(emit-rsync-commands)
        @$(emit-rsync-commands)