From 0a75b96ae6d1e78638ec7fad422ab9c6cfa4fd15 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 8 Feb 1996 04:20:25 +0000 Subject: [PATCH] Upped to 0.30. Doc fixes --- ChangeLog | 2 ++ Makefile.in | 2 +- TODO | 10 +++++++++- automake.texi | 20 ++++++++++++-------- configure | 2 +- configure.in | 2 +- version.texi | 2 +- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 533f20de..a45b125c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Wed Feb 7 18:00:29 1996 Tom Tromey + * configure.in (VERSION): Upped to 0.30. + * Makefile.am (automake): Removed. (DIST_OTHER): Removed. diff --git a/Makefile.in b/Makefile.in index b8dbf408..3444e9cb 100644 --- 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 2024810a..c765d8c3 100644 --- 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 cd31b476..6d2d27f4 100644 --- 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 9252c108..bef3b5cd 100755 --- a/configure +++ b/configure @@ -522,7 +522,7 @@ cat >> confdefs.h <> confdefs.h <