From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Tue, 6 Sep 2005 07:35:51 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
X-Git-Tag: v2.6.14-rc1~750
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef88b7dba2b47c70037a34a599d383462bb74bd3;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
---

ef88b7dba2b47c70037a34a599d383462bb74bd3
diff --cc Makefile
index 2d68adbcfa,c6aae86a02..63e5c9f0bc
--- a/Makefile
+++ b/Makefile
@@@ -367,15 -369,10 +369,10 @@@ export AFLAGS AFLAGS_KERNEL AFLAGS_MODU
  # even be read-only.
  export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions
  
- # The temporary file to save gcc -MD generated dependencies must not
- # contain a comma
- comma := ,
- depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
- 
  # Files to ignore in find ... statements
  
 -RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc \) -prune -o
 -RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc
 +RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o
 +RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg
  
  # ===========================================================================
  # Rules shared between *config targets and build targets