From e29f213cf969e0a23ea2af573c494bc8d38f0d14 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 26 Jan 2000 09:50:12 -0500 Subject: [svn-r1949] Problem: The Dependencies files were generated in $srcdir even when --srcdir is used. It caused conflicts if multiple hosts are doing make sharing the same $srcdir. It also violated the rule that --srcdir would not modify the content of $srcdir which could be on a read-only media like a CD-ROM. Solution: Dependencies files are generated in the "current" directory. Platform tested: dangermouse (linux), modi4 (IRIX64). --- config/conclude.in | 2 +- config/depend1.in | 14 +++++++------- config/depend2.in | 2 +- config/depend3.in | 2 +- config/depend4.in | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/conclude.in b/config/conclude.in index ec89061..49be374 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -173,6 +173,6 @@ maintainer-clean: distclean ## source files and the header files. ##----------------------------------------------------------------------------- .PHONY: dep depend -dep depend: $(srcdir)/Dependencies +dep depend: Dependencies @DEPEND@ diff --git a/config/depend1.in b/config/depend1.in index 62129b4..4a24846 100644 --- a/config/depend1.in +++ b/config/depend1.in @@ -20,14 +20,14 @@ ## otherwise the file is changed and a backup is saved by appending a ## tilde to the file name. ## -.PRECIOUS: $(srcdir)/Dependencies -$(srcdir)/Dependencies: .depend +.PRECIOUS: Dependencies +Dependencies: .depend @if test "$(srcdir)" != "."; then \ echo '## This file is machine generated on GNU systems.' \ >$@; \ echo '## Only temporary changes may be made here.' \ >>$@; \ - echo >>$(srcdir)/Dependencies; \ + echo >>$@; \ perl -p $(top_srcdir)/bin/distdep .depend >>$@; \ fi @@ -49,11 +49,11 @@ $(srcdir)/Dependencies: .depend done; @if test "$(srcdir)" != "."; then \ echo '## This file is machine generated on GNU systems.' \ - >$(srcdir)/Dependencies; \ + >Dependencies; \ echo '## Only temporary changes may be made here.' \ - >>$(srcdir)/Dependencies; \ - echo >>$(srcdir)/Dependencies; \ - perl -p $(top_srcdir)/bin/distdep .depend>>$(srcdir)/Dependencies;\ + >>Dependencies; \ + echo >>Dependencies; \ + perl -p $(top_srcdir)/bin/distdep .depend>>Dependencies;\ fi -include .depend diff --git a/config/depend2.in b/config/depend2.in index f67914f..ae49989 100644 --- a/config/depend2.in +++ b/config/depend2.in @@ -8,4 +8,4 @@ ## `.distdep' file from the source tree. This file was automatically generated ## on some system that satisfies the above requirements. --include $(srcdir)/Dependencies +-include Dependencies diff --git a/config/depend3.in b/config/depend3.in index e856bc5..26056d2 100644 --- a/config/depend3.in +++ b/config/depend3.in @@ -4,4 +4,4 @@ ## `.distdep' file from the source tree. This file was automatically generated ## on some system that satisfies the above requirements. -.include <$(srcdir)/Dependencies> +.include diff --git a/config/depend4.in b/config/depend4.in index b0324d9..84e0f53 100644 --- a/config/depend4.in +++ b/config/depend4.in @@ -4,4 +4,4 @@ ## `.distdep' file from the source tree. This file was automatically generated ## on some system that satisfies the above requirements. -include $(srcdir)/Dependencies +include Dependencies -- cgit v0.12