From 096651982a9bde36957d1420d9215c61cac47b16 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 29 May 1997 05:49:03 +0000 Subject: [PATCH] .P depends on built sources again --- ChangeLog | 5 +++++ TODO | 5 +++++ depend.am | 7 +++++-- lib/am/depend.am | 7 +++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ed90b92..ec987b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 28 23:40:33 1997 Tom Tromey + + * depend.am (.deps/.P): Depend on $(BUILT_SOURCES) again. From + Gord Matzigkeit. + Mon May 26 22:50:49 1997 Tom Tromey * remake-hdr.am ($(srcdir)/@STAMP@.in): Make echo silent. Report diff --git a/TODO b/TODO index fd469282..0cdf60c5 100644 --- 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 b17b9603..ec6489c5 100644 --- 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 b17b9603..ec6489c5 100644 --- 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. -- 2.43.5