diff options
| author | Tom Tromey <tromey@redhat.com> | 1997-06-01 19:54:31 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1997-06-01 19:54:31 +0000 |
| commit | 7434bb5fb0280c536a029e42a6e1523b8fc6c762 (patch) | |
| tree | 6971eb4d4c86ab5e65641d69c65c33c4b475af76 /lib | |
| parent | 7849ac20339e52b2b7185d35d80db3fdd7ebc873 (diff) | |
| download | automake-7434bb5fb0280c536a029e42a6e1523b8fc6c762.tar.gz | |
various bug fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/am/depend.am | 4 | ||||
| -rw-r--r-- | lib/am/depend2.am | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/am/depend.am b/lib/am/depend.am index ec6489c52..335b98b05 100644 --- 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 2c399fb7d..1eed7925f 100644 --- 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 |