From 62c968342bb85207a033d45463ac610d76012ce2 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:58:18 +0000
Subject: Support for GCC3s new .d output location Author: jgg Date: 2001-05-29
 05:11:03 GMT Support for GCC3s new .d output location

---
 buildlib/defaults.mak       | 8 +++++++-
 buildlib/environment.mak.in | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'buildlib')

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 35a3e71de..3ecf4ba27 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -140,9 +140,15 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) :
 # makedep program that can be called after compiling, that's illistrated
 # by the DEPFLAG case.
 # Compile rules are expected to call this macro after calling the compiler
+ifdef GCC3DEP
+DFILE = $(DEP)/$(basename $(@F)).d
+else
+DFILE = $(basename $(@F)).d
+endif
 ifdef INLINEDEPFLAG
  define DoDep
-	sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(@F).d
+	sed -e "1s/.*:/$(subst /,\\/,$@):/" $(DFILE) > $(DEP)/$(@F).d
+	#sed -e "1s/.*:/$(subst /,\\/,$@):/" $(DEP)/$(basename $(@F)).d > $(DEP)/$(@F).d
 	-rm -f $(basename $(@F)).d
  endef
 else
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 9ec0f4b41..eab60c1bc 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -19,6 +19,7 @@ AR:=@AR@
 RANLIB:=@RANLIB@
 
 # Dep generation - this only works for gnu stuff
+GCC3DEP = @GCC3DEP@
 INLINEDEPFLAG = -MD
 
 # Debian doc stuff
-- 
cgit v1.2.3