Upped to 0.30. Doc fixes

diff --git a/ChangeLog b/ChangeLog
index 533f20dea430600b8b32ece676ae5a6fbda323e3..a45b125c97fec22d4b77a1a1790f7aac075a16f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Wed Feb  7 18:00:29 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * configure.in (VERSION): Upped to 0.30.
+
        * Makefile.am (automake): Removed.
        (DIST_OTHER): Removed.
 

diff --git a/Makefile.in b/Makefile.in
index b8dbf4089cb5d40bc0d2df3b83074dffa8317e4b..3444e9cb78b0745e3b0050e3c8af99cfc6c79c5b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.29 from Makefile.am
+# Makefile.in generated automatically by automake 0.30 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation

diff --git a/TODO b/TODO
index 2024810a9ce4eb798eedfef107735e8d78c82968..c765d8c3433f6d4430c3e009fc19dfd763663f2d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,13 @@
 Top priorities:
+* DOCUMENT
 * Must rewrite am_install_var.  Should break into multiple functions.
   This will allow the callers to be a little smarter.
 * Rewrite clean targets.
 
+Make HEADERS obsolete
+
+Think about ways to make automake fit better with Cygnus-style trees.
+
 Handle MAINT_CHARSET.  Use recode in dist target.  Handle dist-zoo and
 dist-zip.
 
@@ -169,6 +174,8 @@ How to deal with @LIBOBJS@.
 configure scanning
 putting .h files into blah_SOURCES is ok now
 version.texi handling
+gettext support
+all options
 
 ================================================================
 
@@ -195,4 +202,5 @@ a "config.status"-style filter, and thence into make.  Why bother,
 other than the gee-whiz factor?
 
 Would it be useful to integrate in some way with the Debian package
-building utility?  Must check.
+building utility?  Must check.  maybe it would be possible to deal
+with all the different package utilities somehow.

diff --git a/automake.texi b/automake.texi
index cd31b47676740030f4b04b3de6b6e29eb06b61f4..6d2d27f49258cc96fb32bf90880b65e1b29fc529 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -311,6 +311,9 @@ hello_SOURCES = hello.c
 This causes @file{hello.o} to be built from @code{hello.c} at compile
 time, and then linked into @file{hello}.
 
+If @samp{@var{prog}_SOURCES} is not specified, then it defaults to the
+single file @samp{@var{prog}.c}.
+
 Multiple programs can be built in a single directory -- simply list them
 all in the @samp{PROGRAMS} definition.  Multiple programs can share a
 single source file.  The source file must be listed in each ``_SOURCES''
@@ -334,7 +337,7 @@ actually can be used to add any options to the linker command line.
 Sometimes, multiple programs are built in one directory but do not share
 the same link-time requirements.  In this case, you can use the
 @samp{@var{prog}_LDADD} variable (where @var{PROG} is the name of the
-program as it appears in @samp{PROGRAMS} to override the global
+program as it appears in @samp{PROGRAMS}) to override the global
 @samp{LDADD}.  (If this variable exists for a given program, then that
 program is not linked using @samp{LDADD}.)
 
@@ -363,11 +366,10 @@ from @file{automake.in}.  Here is how this is handled:
 
 @example
 bin_SCRIPTS = automake
-
-automake: automake.in
-       CONFIG_FILES=$@@ CONFIG_HEADERS= ./config.status
 @end example
 
+FIXME xref to rebuilding things listed in AC_OUTPUT
+
 Script objects can be installed in @samp{bindir}, @samp{sbindir}, or
 @samp{libexecdir}.
 
@@ -376,9 +378,7 @@ Script objects can be installed in @samp{bindir}, @samp{sbindir}, or
 @section Building Libraries
 
 The @samp{LIBRARIES} variable holds the names of libraries to be built
-in the current directory.  If the libraries to be built vary at
-configure time, you may define @samp{AM_LIBRARIES} to supply
-@code{automake} with the full static list of possible libraries.
+in the current directory.
 
 For a given library @samp{zot}, the sources are taken to be in
 @samp{zot_SOURCES}, just as for programs.  Note that libraries and
@@ -727,7 +727,8 @@ generated @file{Makefile.in}, and thus into the distribution.
 @samp{--include-deps} also turns off inclusion of the dependency
 generation code.
 
-There should probably be a way to suppress this mode.
+This mode can be suppressed by putting @samp{no-dependencies} in the
+variable @samp{AUTOMAKE_OPTIONS}.
 
 
 @node Options
@@ -754,6 +755,9 @@ Turn on automatic de-ANSI-fication.
 @item dist-shar
 Generate a @samp{dist-shar} target as well as the ordinary @samp{dist}
 target.
+
+@item no-dependencies
+Never include dependencies in the generated @file{Makefile.in}.
 @end table
 
 @node Extending

diff --git a/configure b/configure
index 9252c108333ba06b0043868dc44f51d04dd85fdb..bef3b5cdf0c77214746e48f0f1c955e2825c0dfa 100755 (executable)
--- a/configure
+++ b/configure
@@ -522,7 +522,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=0.29
+VERSION=0.30
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/configure.in b/configure.in
index cc92909a3f87cc6ec260d44461d1d4041c00e14b..9a5a20568a980a126eacd2f6506cf5ba4ad75e50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl AC_CONFIG_HEADER(config.h)
 PACKAGE=automake
 AC_SUBST(PACKAGE)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-VERSION=0.29
+VERSION=0.30
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 ALL_LINGUAS=

diff --git a/version.texi b/version.texi
index 3acc1cd81881f6d11676de242b89309d5fd8d7cc..ebedc8786529a370b19a2b57889e6caae0d003b7 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 22 January
+@set UPDATED 7 February
 @set EDITION 0.29
 @set VERSION 0.29