aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2003-09-21 01:03:23 +0200
committerSam Ravnborg <sam@mars.ravnborg.org>2003-09-21 01:03:23 +0200
commite272a0c64add38a4c92adf6943d2eed964e68419 (patch)
treef8667696c81ca866e1e7712baf65e3be67a7bce9 /Makefile
parent0900977229ba94e87e7ce3bd348f6bc486296727 (diff)
parentefacc21675da4a95b7f62ad54dacf4802926c371 (diff)
downloadhistory-e272a0c64add38a4c92adf6943d2eed964e68419.tar.gz
Merge mars.ravnborg.org:/home/sam/bk/kbuild-patchset-1
into mars.ravnborg.org:/home/sam/bk/sepout
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3fbdc69ba1aef..b44445c1bd9b0 100644
--- a/Makefile
+++ b/Makefile
@@ -302,12 +302,15 @@ RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CV
# Helpers built in scripts/
-scripts/docproc scripts/fixdep scripts/split-include : scripts ;
+scripts/docproc scripts/split-include : scripts ;
-.PHONY: scripts
+.PHONY: scripts scripts/fixdep
scripts:
$(Q)$(MAKE) $(build)=scripts
+scripts/fixdep:
+ $(Q)$(MAKE) $(build)=scripts $@
+
# To make sure we do not include .config for any of the *config targets
# catch them early, and hand them over to scripts/kconfig/Makefile
@@ -385,8 +388,8 @@ include .config
# If .config is newer than include/linux/autoconf.h, someone tinkered
# with it and forgot to run make oldconfig
-include/linux/autoconf.h: scripts/fixdep .config
- $(Q)$(MAKE) $(build)=scripts/kconfig silentoldconfig
+include/linux/autoconf.h: .config
+ $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
endif
@@ -745,7 +748,7 @@ MRPROPER_FILES += \
.menuconfig.log \
include/asm \
.hdepend include/linux/modversions.h \
- tags TAGS cscope kernel.spec \
+ tags TAGS cscope.out kernel.spec \
.tmp*
# Directories removed with 'make mrproper'