various bug fixes

diff --git a/ChangeLog b/ChangeLog
index f9ceaaa8dc75cf2853f807c7a6a7ffb05557dccb..0c2d84523838f2b29183649de42d704c49ba997e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 Sun Jun  1 13:16:05 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * depend2.am (.deps/%.P): Don't generate file if MKDEP fails.
+       From Alexandre Oliva.
+
+       * depend.am (.deps/.P): Depend on PRE_BUILT_SOURCES, not
+       BUILT_SOURCES.
+
+       * automake.in (initialize_global_constants): Added 1997 to
+       copyright info.
+
        * automake.in (output_yacc_build_rule): Never move y.tab.c over
        the .h file.  From Jim Meyering.
 

diff --git a/TODO b/TODO
index 0cdf60c5143f2f5e9819b96044fe65b442beebb0..69706d38f23b46b435c0c6151472bf410ae796ab 100644 (file)
--- a/TODO
+++ b/TODO
@@ -12,6 +12,9 @@
 * BUILT_SOURCES should not be distributed, even when they appear in
   another _SOURCES line. [? or maybe just leave this up to the
   to-be-defined generic distribution method ]
+  must completely revisit the entire BUILT_SOURCES idea
+  probably should generate dependencies as side effect of compile
+  (but that will mess up guile distributions... sigh)
 
 * in --cygnus, clean-info not generated at top level
 

diff --git a/automake.in b/automake.in
index 4e92d99aeb7c8b5e0b336391ef124eb858d656ce..4c90c5eb025ba6d22358174652532e71cc53ca79 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5225,7 +5225,7 @@ sub initialize_global_constants
 
     # Copyright on generated Makefile.ins.
     $gen_copyright = "\
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ";

diff --git a/automake.texi b/automake.texi
index f335ef0864a28446f9e28cafcc8556f609f96df8..d009e4128744b60b1f4507526c766f43ea9d7626 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1770,8 +1770,6 @@ Occasionally a file which would otherwise be called ``source'' (eg a C
 should be listed in the @code{BUILT_SOURCES} variable.
 @vindex BUILT_SOURCES
 
-By default, built sources are not included in a distribution.
-
 Built sources are also not compiled by default.  You must either
 explicitly mention them in some other @samp{_SOURCES} variable for this
 to happen.
@@ -1782,6 +1780,18 @@ automatic dependency tracking, the @file{Makefile} must depend on
 @code{$(BUILT_SOURCES)}.  This can cause these sources to be rebuilt at
 what might seem like funny times.
 
+There is another variable that can be used to list built sources.  It is
+called @code{PRE_BUILT_SOURCES}.
+@vindex PRE_BUILT_SOURCES
+This variable should be used to list any sources that are required
+before dependency computation on the @code{BUILT_SOURCES} can be done.
+For instance, automatically-generated header files used by other
+automatically generated files would be listed here.
+
+Note that if any files in @code{PRE_BUILT_SOURCES} is rebuilt, then all
+the dependency information for every object will need to be recomputed.
+So this variable should be used sparingly.
+
 
 @node Other GNU Tools
 @chapter Other GNU Tools

diff --git a/depend.am b/depend.am
index ec6489c52cd6874b5e50d4e253264574f8152bf2..335b98b055b58159ae1f7adae95bd76dbb71472f 100644 (file)
--- a/depend.am
+++ b/depend.am
@@ -26,10 +26,10 @@ MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 ## duplicated by any C source file.  (Well, there could be ".c", but
 ## no one does that in practice)
 -include .deps/.P
-## This depends on $(BUILT_SOURCES) because that lets us generate
+## This depends on $(PRE_BUILT_SOURCES) because that lets us generate
 ## dependencies for files that don't exist at the start of a fresh
 ## build.
-.deps/.P: $(BUILT_SOURCES)
+.deps/.P: $(PRE_BUILT_SOURCES)
        test -d .deps || mkdir .deps
 ## Use ":" here and not "echo timestamp".  Otherwise GNU Make barfs:
 ## .deps/.P:1: *** missing separator.  Stop.

diff --git a/depend2.am b/depend2.am
index 2c399fb7d066697ca2ab5439c19006b0a30ed403..1eed7925f74c812042e8ebcf86a8de6251a93482 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,4 +19,6 @@
        @echo "Computing dependencies for $<..."
        @o='o'; \
 ONLYC  test -n "$o" && o='$$o'; \
-       $(@MKDEP@) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@
+       $(@MKDEP@) $< >$@.tmp \
+         && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
+         && rm -f $@.tmp

diff --git a/lib/am/depend.am b/lib/am/depend.am
index ec6489c52cd6874b5e50d4e253264574f8152bf2..335b98b055b58159ae1f7adae95bd76dbb71472f 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -26,10 +26,10 @@ MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 ## duplicated by any C source file.  (Well, there could be ".c", but
 ## no one does that in practice)
 -include .deps/.P
-## This depends on $(BUILT_SOURCES) because that lets us generate
+## This depends on $(PRE_BUILT_SOURCES) because that lets us generate
 ## dependencies for files that don't exist at the start of a fresh
 ## build.
-.deps/.P: $(BUILT_SOURCES)
+.deps/.P: $(PRE_BUILT_SOURCES)
        test -d .deps || mkdir .deps
 ## Use ":" here and not "echo timestamp".  Otherwise GNU Make barfs:
 ## .deps/.P:1: *** missing separator.  Stop.

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 2c399fb7d066697ca2ab5439c19006b0a30ed403..1eed7925f74c812042e8ebcf86a8de6251a93482 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,4 +19,6 @@
        @echo "Computing dependencies for $<..."
        @o='o'; \
 ONLYC  test -n "$o" && o='$$o'; \
-       $(@MKDEP@) $< | sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," > $@
+       $(@MKDEP@) $< >$@.tmp \
+         && sed "s,^\(.*\)\.o:,\1.$$o \1.l$$o $@:," < $@.tmp > $@ \
+         && rm -f $@.tmp

diff --git a/stamp-vti b/stamp-vti
index 765248ed47905842d55a5b8cabf328aabeb54c9d..c50d1dfcc027935cc681ed3c464c1c693b70fd96 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 26 May 1997
+@set UPDATED 1 June 1997
 @set EDITION 1.1q
 @set VERSION 1.1q

diff --git a/version.texi b/version.texi
index 765248ed47905842d55a5b8cabf328aabeb54c9d..c50d1dfcc027935cc681ed3c464c1c693b70fd96 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 26 May 1997
+@set UPDATED 1 June 1997
 @set EDITION 1.1q
 @set VERSION 1.1q