Gary V. Vaughan <gary@gnu.org>

* Makefile.am: Update the maintainer rules against HEAD, I
cannot seem to find Gary's original ChangeLog entry for these.

diff --git a/ChangeLog b/ChangeLog
index ef19c77c64bbec95544a3e07151ddbc8ce1c7315..544ce6f1df3e86b82f5c20497d1f8c0c9bf004d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-25  Scott James Remnant  <scott@netsplit.com>
+       Gary V. Vaughan  <gary@gnu.org>
+
+       * Makefile.am: Update the maintainer rules against HEAD, I
+       cannot seem to find Gary's original ChangeLog entry for these.
+
 2004-01-25  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in: Check for module_cmds if max_cmd_len is exceeded too.

diff --git a/Makefile.am b/Makefile.am
index d11a84adbb7a6400270e6711ac49cee627dcf1d0..9acdb40323c07b4ce9ca311fcbf098c2829c71f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,18 +48,6 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in $(TSDEPS)
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
        cp $@ $(srcdir)/libltdl/
 
-# TSDEPS will be defined to TSDEPS_DIST at `make dist' time
-TSDEPS =
-TSDEPS_DIST = ChangeLog libtool.m4
-CVS = cvs # set it to `:' to avoid CVS operations
-
-.PHONY: timestamps update-timestamps
-timestamps distdir: update-timestamps
-update-timestamps:
-       @if (cd $(srcdir) && test -d CVS && \
-           $(CVS) -n update $(TSDEPS_DIST) | grep '^M'); then \
-               echo "Cannot make dist before commit"; exit 1; else :; fi
-
 # All our rules should depend on these demo files.
 all-recursive: $(srcdir)/libltdl/acinclude.m4 $(ACINCLUDE_M4_LIST)
 
@@ -89,19 +77,59 @@ install-data-hook:
 uninstall-local:
        -rm -rf $(DESTDIR)$(pkgdatadir)/libltdl
 
-################################################################
-##
-## Everything past here is useful to the maintainer, but probably not
-## to anybody else (snarfed from automake/Makefile.am).
-##
 
-XDELTA = xdelta
-XDELTA_OPTIONS = --pristine -9
+## ---------------------------------------------------------------- ##
+##  Everything past here is useful to the maintainer, but probably  ##
+##  not to anybody else (inspiration from automake/Makefile.am).    ##
+## ---------------------------------------------------------------- ##
+
+CHECK_LASTRELEASE = if test -z "$(LASTRELEASE)"; \
+                     then echo "LASTRELEASE is not set"; exit 1; fi
+
+.PHONY: cvs-release
+cvs-release: version-check prev-tarball cvs-news fetch cvs-dist cvs-diff xdelta
+       @$(CHECK_LASTRELEASE); tarname="$(PACKAGE)-$(VERSION).tar.gz"; \
+       diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
+       xdeltaname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \
+       echo " *** Upload $$tarname, $$tarname.sig,";\
+       echo " *** $$tarname.directive.asc, $$diffname,"; \
+       echo " *** $$diffname.sig, $$diffname.directive.asc,"; \
+       echo " *** $$xdeltaname, $$xdeltaname.sig and";\
+       echo " *** $$xdeltaname.directive.asc to either";\
+       echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org.";
+
+.PHONY: version-check
+version-check:
+       @case $(VERSION) in \
+       *[acegikmoqsuwy]) \
+         echo "Version \`$(VERSION)' is not a releasable version, please read:"; \
+         echo "    http://www.gnu.org/software/libtool/contribute.html"; \
+         exit 1; \
+         ;; \
+       esac
 
-GPG = gpg # set it to `:' to avoid gpg operations
+.PHONY: prev-tarball
+prev-tarball:
+## Make sure we have the previous release tarball in the tree.
+       @$(CHECK_LASTRELEASE); ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \
+       if test -f $$ofile; then :; \
+       else echo "Cannot make xdelta without $$ofile"; exit 1; fi
 
-.PHONY: cvs-dist cvs-diff xdelta cvs-release
-cvs-dist:
+# TSDEPS will be defined to TSDEPS_DIST at `make dist' time
+TSDEPS =
+TSDEPS_DIST = ChangeLog libtool.m4
+CVS = cvs # set it to `:' to avoid CVS operations
+
+.PHONY: timestamps update-timestamps
+timestamps: update-timestamps
+update-timestamps:
+       @if (cd $(srcdir) && test -d CVS && \
+           $(CVS) -n update $(TSDEPS_DIST) | grep '^M'); then \
+               echo "Cannot make cvs-dist before commit"; exit 1; else :; fi
+
+
+.PHONY: cvs-news
+cvs-news: timestamps
 ## Make sure the NEWS file is up-to-date:
        @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" >/dev/null; \
        then :; \
@@ -109,6 +137,53 @@ cvs-dist:
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1; \
        fi
+
+## Program to use to fetch files.
+WGET = wget
+WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
+
+## Files that we fetch and which we compare against.
+## FIXME should be a lot more here
+FETCHFILES = \
+./INSTALL \
+./config.guess \
+libltdl/config.guess \
+./config.sub \
+libltdl/config.sub \
+doc/texinfo.tex
+
+## Fetch the latest versions of files we care about.
+.PHONY: fetch
+fetch:
+       rm -rf Fetchdir > /dev/null 2>&1
+       mkdir Fetchdir
+## If a get fails then that is a problem.
+       (cd Fetchdir && \
+       $(WGETSGO)/autoconf/autoconf/INSTALL; \
+       $(WGETSGO)/config/config/config.guess; \
+       $(WGETSGO)/config/config/config.sub; \
+       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex )
+## Don't exit after test because we want to give as many errors as
+## possible.
+       @stat=0; for file in $(FETCHFILES); do \
+         fetchedfile=Fetchdir/`echo $$file | sed 's,.*/,,g'`; \
+         if diff -u $(srcdir)/$$file $$fetchedfile \
+           >>Fetchdir/update.patch 2>/dev/null; then :; \
+         else \
+           stat=1; \
+           echo "Updating $(srcdir)/$$file..."; \
+           cp $$fetchedfile $(srcdir)/$$file; \
+         fi; \
+       done; \
+       test $$stat = 1 && \
+         echo "See Fetchdir/update.patch for a log of the changes."; \
+       exit $$stat
+
+
+GPG = gpg # set it to `:' to avoid gpg operations
+
+.PHONY: cvs-dist
+cvs-dist: cvs-news
 ## Build the distribution:
        $(MAKE) distcheck
 ## Finally, if everything was successful, commit the last changes and tag
@@ -127,23 +202,26 @@ cvs-dist:
          && $(GPG) --clearsign $$ofile.directive \
          && rm -f $$ofile.directive
 
+.PHONY: cvs-diff
 cvs-diff:
 ## Figure out which cvs tags we are diffing, and if the diff works we
 ## compress it and then generate the signatures needed for FSF ftp-upload:
        thisver=`echo "release-$(VERSION)" | sed 's/\./-/g'`; \
-       if test -z "$$OLDVERSION"; then \
-         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
-       else prevno="$$OLDVERSION"; fi; \
-       prevver=release-`echo $$prevno | sed 's/\./-/g'`; \
-       ofile="$(PACKAGE)-$$prevno-$(VERSION).diff.gz"; \
+       $(CHECK_LASTRELEASE); \
+       prevver=release-`echo $(LASTRELEASE) | sed 's/\./-/g'`; \
+       ofile="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
        $(CVS) -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
-           | GZIP=$(GZIP_ENV) gzip -c > $$ofile; \
+           | GZIP=$(GZIP_ENV) gzip -c > $$ofile \
          && $(GPG) --detach-sign $$ofile \
          && echo "directory: libtool" > $$ofile.directive \
          && $(GPG) --clearsign $$ofile.directive \
          && rm -f $$ofile.directive
 
-xdelta:
+XDELTA = xdelta
+XDELTA_OPTIONS = --pristine -9
+
+.PHONY: xdelta
+xdelta: prev-tarball
 ## Make sure xdelta exists;
        @if ($(XDELTA) --version 2>&1 | grep version)>/dev/null 2>/dev/null; \
        then :;\
@@ -154,57 +232,13 @@ xdelta:
 ## Generate the delta file (xdelta has wierd exit statuses, so we need to
 ## add some shell code to keep make happy), and then generate the signatures
 ## for FSF ftp-upload:
-       if test -z "$$OLDVERSION"; then \
-         prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
-       else prevno="$$OLDVERSION"; fi; \
-       ofile="$(PACKAGE)-$$prevno-$(VERSION).xdelta"; \
+       $(CHECK_LASTRELEASE); \
+       ofile="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \
        ( test -z `$(XDELTA) delta $(XDELTA_OPTIONS) \
-           $(PACKAGE)-$$prevno.tar.gz $(PACKAGE)-$(VERSION).tar.gz \
+           $(PACKAGE)-$(LASTRELEASE).tar.gz $(PACKAGE)-$(VERSION).tar.gz \
            $$ofile 2>&1` \
          && : ) \
        && $(GPG) --detach-sign $$ofile \
        && echo "directory: libtool" > $$ofile.directive \
        && $(GPG) --clearsign $$ofile.directive \
        && rm -f $$ofile.directive
-
-cvs-release: cvs-dist cvs-diff xdelta
-
-## Program to use to fetch files.
-WGET = wget
-WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
-
-## Files that we fetch and which we compare against.
-## FIXME should be a lot more here
-FETCHFILES = \
-./INSTALL \
-./config.guess \
-libltdl/config.guess \
-./config.sub \
-libltdl/config.sub \
-doc/texinfo.tex
-
-## Fetch the latest versions of files we care about.
-fetch:
-       rm -rf Fetchdir > /dev/null 2>&1
-       mkdir Fetchdir
-## If a get fails then that is a problem.
-       (cd Fetchdir && \
-       $(WGETSGO)/autoconf/autoconf/INSTALL; \
-       $(WGETSGO)/config/config/config.guess; \
-       $(WGETSGO)/config/config/config.sub; \
-       $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex )
-## Don't exit after test because we want to give as many errors as
-## possible.
-       @stat=0; for file in $(FETCHFILES); do \
-         fetchedfile=Fetchdir/`echo $$file | sed 's,.*/,,g'`; \
-         if diff -u $(srcdir)/$$file $$fetchedfile \
-           >>Fetchdir/update.patch 2>/dev/null; then :; \
-         else \
-           stat=1; \
-           echo "Updating $(srcdir)/$$file..."; \
-           cp $$fetchedfile $(srcdir)/$$file; \
-         fi; \
-       done; \
-       test $$stat = 1 && \
-         echo "See Fetchdir/update.patch for a log of the changes."; \
-       exit $$stat