diff options
| -rw-r--r-- | .cvsignore | 7 | ||||
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | Makefile.cfg | 1 | ||||
| -rw-r--r-- | Makefile.maint | 97 | ||||
| -rw-r--r-- | config/.cvsignore | 10 | ||||
| -rw-r--r-- | config/Makefile.am | 2 | ||||
| -rwxr-xr-x | config/move-if-change | 17 | ||||
| -rw-r--r-- | config/prev-version.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
9 files changed, 32 insertions, 128 deletions
@@ -7,9 +7,15 @@ INSTALL Makefile Makefile.in _* +a.exe +a.out aclocal.m4 autom4te.cache +b.out bison-* +build-aux +conf[0-9]* +confdefs* config.cache config.h config.hin @@ -17,6 +23,7 @@ config.log config.status configure configure.lineno +conftest* intl patches releases @@ -1,5 +1,27 @@ 2005-05-22 Paul Eggert <eggert@cs.ucla.edu> + Various maintainer cleanups. + * .cvsignore: Add a.exe, a.out, b.out,, conf[0-9]*, confdefs*, + conftest*, for benefit of CVS commands run at the same time as + "configure". Add build-aux, since "bootstrap" now creates it and + its subfiles. + * Makefile.cfg (move_if_change): Remove. + * Makefile.maint: Remove the update stuff; we now use "bootstrap". + (ftp-gnu, www-gnu, move_if_change, local_updates, update): + (po_repo, do-po-update, po-update, wget_files, get-targets): + (config.guess-url_prefix, config.sub-url_prefix): + (ansi2knr.c-url_prefix, texinfo.tex-url_prefix): + (standards.texi-url_prefix, make-stds.texi-url_prefix, taget, url): + ($(get-targets), cvs-files, automake_repo, wget-update, cvs-update): + Remove. + * configure.ac (AC_CONFIG_AUX_DIR): Change from config to build-aux; + this is now the recommended name. + * config/.cvsignore: Remove config.guess, config.rpath, config.sub, + depcomp, install-sh, mdate-sh, missing, mkinstalldirs, texinfo.tex, + ylwrap. These files now go into build-aux. + * config/move-if-change: Remove. + * config/prev-version.txt: Bump from 1.75 to 2.0. + * bootstrap: Add stdio-safer, unistd-safer modules. Remove m4/glibc2.m4 (introduced by latest gnulib, but we don't need it). diff --git a/Makefile.cfg b/Makefile.cfg index 07b3ae03..0d72c3eb 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -17,7 +17,6 @@ # 02110-1301, USA. prev_version_file = $(srcdir)/config/prev-version.txt -move_if_change = $(srcdir)/config/move-if-change announce_gen = $(srcdir)/config/announce-gen release_archive_dir = releases diff --git a/Makefile.maint b/Makefile.maint index e399a294..e803a810 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -395,103 +395,6 @@ announcement: NEWS ChangeLog $(rel-files) $(signatures) $(addprefix --url-dir=, $(url_dir_list)) \ -## ---------------- ## -## Updating files. ## -## ---------------- ## - -ftp-gnu = ftp://ftp.gnu.org/gnu -www-gnu = http://www.gnu.org - -# Use mv, if you don't have/want move-if-change. -move_if_change ?= move-if-change - - -# --------------------- # -# Updating everything. # -# --------------------- # - -.PHONY: update -local_updates ?= wget-update cvs-update po-update -update: $(local_updates) - - -# ------------------- # -# 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) $(WGETFLAGS) -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/config.guess \ - $(srcdir)/config/config.sub \ - $(srcdir)/src/ansi2knr.c \ - $(srcdir)/config/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 = $(www-gnu)/prep/ -make-stds.texi-url_prefix = $(standards.texi-url_prefix) - -target = $(patsubst get-%, %, $@) -url = $($(notdir $(target))-url_prefix)$(notdir $(target)) - -.PHONY: $(get-targets) -$(get-targets): - $(WGET) $(WGETFLAGS) $(url) -O $(target).t \ - && $(move_if_change) $(target).t $(target) - -cvs_files ?= \ - $(srcdir)/src/ansi2knr.c \ - $(srcdir)/config/depcomp \ - $(srcdir)/config/install-sh \ - $(srcdir)/config/missing \ - $(srcdir)/config/mkinstalldirs -automake_repo=:pserver:anoncvs:anoncvs@sources.redhat.com:/cvs/automake -.PHONY: wget-update -wget-update: $(get-targets) - -.PHONY: cvs-update -cvs-update: - fail=; \ - for f in $(cvs_files); do \ - test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \ - cvs diff $$f > /dev/null \ - || { echo "*** $$f is locally modified; skipping it" 1>&2; \ - fail=yes; continue; }; \ - file=$$(basename $$f); \ - echo checking out $$file...; \ - $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t \ - && $(move_if_change) $$f.t $$f; \ - done; \ - test "$$fail" && exit 1 - define emit-upload-commands echo ===================================== echo ===================================== diff --git a/config/.cvsignore b/config/.cvsignore index 971508e4..0198ce94 100644 --- a/config/.cvsignore +++ b/config/.cvsignore @@ -1,13 +1,3 @@ *.t Makefile Makefile.in -config.guess -config.rpath -config.sub -depcomp -install-sh -mdate-sh -missing -mkinstalldirs -texinfo.tex -ylwrap diff --git a/config/Makefile.am b/config/Makefile.am index b3a810d8..0e2ef7ab 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,2 +1,2 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = move-if-change prev-version.txt config.rpath +EXTRA_DIST = prev-version.txt diff --git a/config/move-if-change b/config/move-if-change deleted file mode 100755 index 66d8b8ad..00000000 --- a/config/move-if-change +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Like mv $1 $2, but if the files are the same, just delete $1. -# Status is 0 if $2 is changed, 1 otherwise. -if -test -r $2 -then -if -cmp -s $1 $2 -then -echo $2 is unchanged -rm -f $1 -else -mv -f $1 $2 -fi -else -mv -f $1 $2 -fi diff --git a/config/prev-version.txt b/config/prev-version.txt index 07cde984..cd5ac039 100644 --- a/config/prev-version.txt +++ b/config/prev-version.txt @@ -1 +1 @@ -1.75 +2.0 diff --git a/configure.ac b/configure.ac index 7de00628..23e99ff5 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ(2.59) AC_INIT([GNU Bison], [2.0a], [bug-bison@gnu.org]) -AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) # We don't have a file m4/Makefile.am, so we need Automake 1.8 or later. |