Support for GCC3s new .d output location

Author: jgg
Date: 2001-05-29 05:11:03 GMT
Support for GCC3s new .d output location

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 35a3e71de25a4ae4079b43def29b39b4c8c41a13..3ecf4ba27d254a1d6d4a24d889bbb8c1f052b5aa 100644 (file)
--- 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
 # 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
 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
        -rm -f $(basename $(@F)).d
  endef
 else

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 9ec0f4b412bd1649e0f2ba92d37297c7a8637d02..eab60c1bc61812926979d3c811bb1f3bacb117d9 100644 (file)
--- 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
 RANLIB:=@RANLIB@
 
 # Dep generation - this only works for gnu stuff

+GCC3DEP = @GCC3DEP@

 INLINEDEPFLAG = -MD
 
 # Debian doc stuff
 INLINEDEPFLAG = -MD
 
 # Debian doc stuff