aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:36:52 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:36:52 -0500
commit25c862cc9ea9b312c25a9f577f91b973131f1261 (patch)
tree8e8f56531144370ced50fa98db2973f4e93e38b0 /Makefile
parent52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (diff)
parent8ded4ac018ea706bf7ee926601a27184665c9c28 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile30
1 files changed, 17 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 497884d3d556..599e744d3e33 100644
--- a/Makefile
+++ b/Makefile
@@ -286,10 +286,6 @@ export quiet Q KBUILD_VERBOSE
286cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ 286cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
287 > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) 287 > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
288 288
289# For backward compatibility
290check_gcc = $(warning check_gcc is deprecated - use cc-option) \
291 $(call cc-option, $(1),$(2))
292
293# cc-option-yn 289# cc-option-yn
294# Usage: flag := $(call cc-option-yn, -march=winchip-c6) 290# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
295cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ 291cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
@@ -481,18 +477,20 @@ ifeq ($(dot-config),1)
481 477
482# Read in dependencies to all Kconfig* files, make sure to run 478# Read in dependencies to all Kconfig* files, make sure to run
483# oldconfig if changes are detected. 479# oldconfig if changes are detected.
484-include .config.cmd 480-include .kconfig.d
485 481
486include .config 482include .config
487 483
488# If .config needs to be updated, it will be done via the dependency 484# If .config needs to be updated, it will be done via the dependency
489# that autoconf has on .config. 485# that autoconf has on .config.
490# To avoid any implicit rule to kick in, define an empty command 486# To avoid any implicit rule to kick in, define an empty command
491.config: ; 487.config .kconfig.d: ;
492 488
493# If .config is newer than include/linux/autoconf.h, someone tinkered 489# If .config is newer than include/linux/autoconf.h, someone tinkered
494# with it and forgot to run make oldconfig 490# with it and forgot to run make oldconfig.
495include/linux/autoconf.h: .config 491# If kconfig.d is missing then we are probarly in a cleaned tree so
492# we execute the config step to be sure to catch updated Kconfig files
493include/linux/autoconf.h: .kconfig.d .config
496 $(Q)mkdir -p include/linux 494 $(Q)mkdir -p include/linux
497 $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig 495 $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
498else 496else
@@ -1066,7 +1064,7 @@ help:
1066 @echo ' all - Build all targets marked with [*]' 1064 @echo ' all - Build all targets marked with [*]'
1067 @echo '* vmlinux - Build the bare kernel' 1065 @echo '* vmlinux - Build the bare kernel'
1068 @echo '* modules - Build all modules' 1066 @echo '* modules - Build all modules'
1069 @echo ' modules_install - Install all modules' 1067 @echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'
1070 @echo ' dir/ - Build all files in dir and below' 1068 @echo ' dir/ - Build all files in dir and below'
1071 @echo ' dir/file.[ois] - Build specified target only' 1069 @echo ' dir/file.[ois] - Build specified target only'
1072 @echo ' dir/file.ko - Build module including final link' 1070 @echo ' dir/file.ko - Build module including final link'
@@ -1240,8 +1238,11 @@ cscope: FORCE
1240quiet_cmd_TAGS = MAKE $@ 1238quiet_cmd_TAGS = MAKE $@
1241define cmd_TAGS 1239define cmd_TAGS
1242 rm -f $@; \ 1240 rm -f $@; \
1243 ETAGSF=`etags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL --extra=+f"`; \ 1241 ETAGSF=`etags --version | grep -i exuberant >/dev/null && \
1244 $(all-sources) | xargs etags $$ETAGSF -a 1242 echo "-I __initdata,__exitdata,__acquires,__releases \
1243 -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
1244 --extra=+f --c-kinds=+px"`; \
1245 $(all-sources) | xargs etags $$ETAGSF -a
1245endef 1246endef
1246 1247
1247TAGS: FORCE 1248TAGS: FORCE
@@ -1251,8 +1252,11 @@ TAGS: FORCE
1251quiet_cmd_tags = MAKE $@ 1252quiet_cmd_tags = MAKE $@
1252define cmd_tags 1253define cmd_tags
1253 rm -f $@; \ 1254 rm -f $@; \
1254 CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL --extra=+f"`; \ 1255 CTAGSF=`ctags --version | grep -i exuberant >/dev/null && \
1255 $(all-sources) | xargs ctags $$CTAGSF -a 1256 echo "-I __initdata,__exitdata,__acquires,__releases \
1257 -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
1258 --extra=+f --c-kinds=+px"`; \
1259 $(all-sources) | xargs ctags $$CTAGSF -a
1256endef 1260endef
1257 1261
1258tags: FORCE 1262tags: FORCE