.P depends on built sources again

diff --git a/ChangeLog b/ChangeLog
index 4ed90b928eacdf3ec3e4fed1784073784ffa950f..ec987b1510c6b4212e2665f9f49b643273b1f2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 28 23:40:33 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * depend.am (.deps/.P): Depend on $(BUILT_SOURCES) again.  From
+       Gord Matzigkeit.
+
 Mon May 26 22:50:49 1997  Tom Tromey  <tromey@cygnus.com>
 
        * remake-hdr.am ($(srcdir)/@STAMP@.in): Make echo silent.  Report

diff --git a/TODO b/TODO
index fd4692824878d248795b31233e860390f8b41a36..0cdf60c5143f2f5e9819b96044fe65b442beebb0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,6 +2,11 @@
   look at gcc's Makefile.in to see what to do
   or look at maint program
 
+* Karl wants to be able to set LIBS and LDFLAGS at build time, like CFLAGS
+  maybe we need something more general?
+
+* add $(srcdir)/ before some dependencies?
+
 * define LINK if a program is mentioned, even if no C sources appear
 
 * BUILT_SOURCES should not be distributed, even when they appear in

diff --git a/depend.am b/depend.am
index b17b96031fbbd38b4cff7482112aba30023aea44..ec6489c52cd6874b5e50d4e253264574f8152bf2 100644 (file)
--- a/depend.am
+++ b/depend.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
@@ -26,7 +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
-.deps/.P:
+## This depends on $(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)
        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/depend.am b/lib/am/depend.am
index b17b96031fbbd38b4cff7482112aba30023aea44..ec6489c52cd6874b5e50d4e253264574f8152bf2 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.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
@@ -26,7 +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
-.deps/.P:
+## This depends on $(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)
        test -d .deps || mkdir .deps
 ## Use ":" here and not "echo timestamp".  Otherwise GNU Make barfs:
 ## .deps/.P:1: *** missing separator.  Stop.