aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 8da3a306d0c0..bddcb861b49b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 12 3SUBLEVEL = 12
4EXTRAVERSION =-rc3 4EXTRAVERSION =-rc4
5NAME=Woozy Numbat 5NAME=Woozy Numbat
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
@@ -332,9 +332,7 @@ KALLSYMS = scripts/kallsyms
332PERL = perl 332PERL = perl
333CHECK = sparse 333CHECK = sparse
334 334
335NOSTDINC_FLAGS = -nostdinc -isystem $(shell $(CC) -print-file-name=include)
336CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ 335CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__
337CHECKFLAGS += $(NOSTDINC_FLAGS)
338MODFLAGS = -DMODULE 336MODFLAGS = -DMODULE
339CFLAGS_MODULE = $(MODFLAGS) 337CFLAGS_MODULE = $(MODFLAGS)
340AFLAGS_MODULE = $(MODFLAGS) 338AFLAGS_MODULE = $(MODFLAGS)
@@ -531,6 +529,10 @@ endif
531 529
532include $(srctree)/arch/$(ARCH)/Makefile 530include $(srctree)/arch/$(ARCH)/Makefile
533 531
532# arch Makefile may override CC so keep this after arch Makefile is included
533NOSTDINC_FLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include)
534CHECKFLAGS += $(NOSTDINC_FLAGS)
535
534# warn about C99 declaration after statement 536# warn about C99 declaration after statement
535CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) 537CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
536 538
@@ -1188,8 +1190,8 @@ cmd_TAGS = $(all-sources) | etags -
1188quiet_cmd_tags = MAKE $@ 1190quiet_cmd_tags = MAKE $@
1189define cmd_tags 1191define cmd_tags
1190 rm -f $@; \ 1192 rm -f $@; \
1191 CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL"`; \ 1193 CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL --extra=+f"`; \
1192 $(all-sources) | xargs ctags $$CTAGSF -a --extra=+f 1194 $(all-sources) | xargs ctags $$CTAGSF -a
1193endef 1195endef
1194 1196
1195TAGS: FORCE 1197TAGS: FORCE