* Makefile.am (cvs-dist): our release tags are in lower case

	(cvs-diff): ditto
	(EXTRA_DIST): added README-alpha
	(DIST_SUBDIRS): added depdemo
	* README-alpha: minor adaptations
	* demo/Makefile.am, mdemo/Makefile.am, depdemo/Makefile.am:
	removed comment about special needs for distribution
	* depdemo/Makefile.am: don't generate dependencies
	* depdemo/configure.in: modified version number

diff --git a/ChangeLog b/ChangeLog
index 2f5aba7dca62c684c1637bf38fba3fe85ab8375b..d31b8488de71eb1b480bf9ef2d7c402f1053c7c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 1998-12-16  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * Makefile.am (cvs-dist): our release tags are in lower case
+       (cvs-diff): ditto
+       (EXTRA_DIST): added README-alpha
+       (DIST_SUBDIRS): added depdemo
+       * README-alpha: minor adaptations
+       * demo/Makefile.am, mdemo/Makefile.am, depdemo/Makefile.am:
+       removed comment about special needs for distribution
+       * depdemo/Makefile.am: don't generate dependencies
+       * depdemo/configure.in: modified version number
+
        * ltmain.in (-force-static, force_static): removed
        * libltdl/Makefile.am (CFLAGS): ditto
        * libltdl/configure.in: check for memory.h, rindex() and

diff --git a/Makefile.am b/Makefile.am
index db87cdd0df390d3b2878ec9ca7f6b0aeb55b3871..6bbb44870738469fabf6940709b6f6111d444de0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 ## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 AUTOMAKE_OPTIONS = gnits
 SUBDIRS = doc tests libltdl
-DIST_SUBDIRS = $(SUBDIRS) demo mdemo
+DIST_SUBDIRS = $(SUBDIRS) demo depdemo mdemo
 
 # We need to export these variables when we run ltconfig.
 CFLAGS = @CFLAGS@
@@ -10,7 +10,8 @@ CPPLAGS = @CPPFLAGS@
 
 aclocal_macros = libtool.m4
 
-EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in libtool.spec
+EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in \
+       libtool.spec README-alpha # remove this for a non-alpha release
 CLEANFILES = libtool libtoolize
 MAINTAINERCLEANFILES = ltconfig ltmain.sh
 
@@ -62,6 +63,7 @@ ACINCLUDE_M4_LIST = \
        $(srcdir)/acinclude.m4 \
        $(srcdir)/libltdl/acinclude.m4 \
        $(srcdir)/demo/acinclude.m4 \
+       $(srcdir)/depdemo/acinclude.m4 \
        $(srcdir)/mdemo/acinclude.m4
 
 # All our rules should depend on these demo files.
@@ -81,18 +83,18 @@ $(ACINCLUDE_M4_LIST): $(srcdir)/libtool.m4
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 cvs-dist: distcheck
-       @if sed 1q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
+       @if sed 1,2d;3q $(srcdir)/NEWS | grep -e "$(VERSION)" > /dev/null; then :; else \
          echo "NEWS not updated; not releasing" 1>&2; \
          exit 1;                               \
        fi
-       cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'`
+       cd $(srcdir) && cvs -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'`
        $(MAKE) dist
 
 cvs-diff:
-       thisver=`echo "Release-$(VERSION)" | sed 's/\./-/g'`; \
+       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'`; \
+       prevver=release-`echo $$prevno | sed 's/\./-/g'`; \
        cvs -f rdiff -c -r $$prevver -r $$thisver $(PACKAGE) \
            > $(PACKAGE)-$$prevno-$(VERSION).diff

diff --git a/README-alpha b/README-alpha
index 1b41fb65ec8934eef2c633a75f904cf364201d02..3f8a4e090aee01198364d0bed3d0b467ca76a154 100644 (file)
--- a/README-alpha
+++ b/README-alpha
@@ -8,7 +8,8 @@ CVS version of this package, do:
   ./autogen
 
 The `autogen' script sets up the source directory for you to hack. To
-use it, you need a recent version of both Autoconf and Automake.
+use it, you need a recent (maybe yet to be released) version of both
+Autoconf and Automake.
 
 Please do not send any bug reports or questions about this snapshot to
 public forums (such as GNU newsgroups), send them directly to the
@@ -49,19 +50,17 @@ libtool mailing list, <bug-libtool@gnu.org>.
 = Release procedure
 
 * Fetch new versions of the files that are maintained by the FSF.
-  Commit.  Unfortunately you need an FSF account to do this.
+  Unfortunately you need an FSF account to do this.
 
-* Update NEWS.  For an alpha release, update README-alpha.
+* Update NEWS.
 
-* Update the version number in configure.in.
+* Update the version number in configure.in and libtool.spec.
   (The idea is that every other alpha number will be a net release.
   The repository will always have its own "odd" number so we can easily
   distinguish net and repo versions.)
 
 * Configure, build, and install.
 
-* Run aclocal, automake, and autoconf.
-
 * Commit
 
 * Run `make cvs-dist'
@@ -70,4 +69,4 @@ libtool mailing list, <bug-libtool@gnu.org>.
   (If not an alpha, announcement must also go to FSF.)
 
 * Update version number in configure.in to next alpha number.
-  Re-run autoconf and commit.
+  Commit.

diff --git a/demo/Makefile.am b/demo/Makefile.am
index f6ead3ccec024c17ff17c6df790810b73887dcf0..ceb1519e5ea1275547b4d8d9e9d0da87f0cf8a25 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -1,8 +1,5 @@
 # A brief demonstration of using Automake with Libtool. -*-Makefile-*-
 #
-# NOTE: Don't forget that in the libtool distribution, files in this
-# directory are distributed by the demo_distfiles variable in the top
-# level Makefile.
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
 EXTRA_DIST = $(TESTS) acinclude.m4

diff --git a/depdemo/Makefile.am b/depdemo/Makefile.am
index 74dc0404bae604b3afd0f0191277bec1dd75b3cc..2143309285fc5f12ae531e3ad423c2efeeae5004 100644 (file)
--- a/depdemo/Makefile.am
+++ b/depdemo/Makefile.am
@@ -1,11 +1,6 @@
-# A brief demonstration of using Automake with Libtool. -*-Makefile-*-
+# A brief demonstration of inter-library dependencies
 #
-# NOTE: Don't forget that in the libtool distribution, files in this
-# directory are distributed by the demo_distfiles variable in the top
-# level Makefile.
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = acinclude.m4
+AUTOMAKE_OPTIONS = no-dependencies foreign
 
 lib_LTLIBRARIES = libl1.la libl2.la libl3.la libl4.la
 libl1_la_SOURCES = l1.c l1.h sysdep.h

diff --git a/depdemo/configure.in b/depdemo/configure.in
index 3cb959189cff6f974bc54321b3e1b23ced6b1dbe..03de5cf2be180ecd3777f7e93758d32e342a3a19 100644 (file)
--- a/depdemo/configure.in
+++ b/depdemo/configure.in
@@ -1,6 +1,6 @@
 dnl Initialize the hell package.
 AC_INIT(main.c)
-AM_INIT_AUTOMAKE(depdemo,1.0)
+AM_INIT_AUTOMAKE(depdemo,0.1)
 
 AC_PROG_CC
 AC_EXEEXT

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 9ab9f737ade7f9f84b43ddfa94b8b189ccd3a867..f3d06d096eb4ef29421fb4850fde5d514a285bd6 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -1,8 +1,5 @@
-# A brief demonstration of using Automake with Libtool. -*-Makefile-*-
+# A brief demonstration of Libtool modules. -*-Makefile-*-
 #
-# NOTE: Don't forget that in the libtool distribution, files in this
-# directory are distributed by the demo_distfiles variable in the top
-# level Makefile.
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
 INCLUDES = -I$(srcdir)/../libltdl