projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firmware: teach the kernel to load firmware files directly from the filesystem
[cascardo/linux.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
48bd1f5
..
7502f5f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 3
PATCHLEVEL = 4
SUBLEVEL = 0
VERSION = 3
PATCHLEVEL = 4
SUBLEVEL = 0
-EXTRAVERSION =
-rc7
+EXTRAVERSION =
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
NAME = Saber-toothed Squirrel
# *DOCUMENTATION*
@@
-442,7
+442,7
@@
asm-generic:
no-dot-config-targets := clean mrproper distclean \
cscope gtags TAGS tags help %docs check% coccicheck \
no-dot-config-targets := clean mrproper distclean \
cscope gtags TAGS tags help %docs check% coccicheck \
- include/linux/version.h headers_% archheaders \
+ include/linux/version.h headers_% archheaders
archscripts
\
kernelversion %src-pkg
config-targets := 0
kernelversion %src-pkg
config-targets := 0
@@
-620,6
+620,10
@@
endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
+ifdef CONFIG_ERROR_ON_WARNING
+KBUILD_CFLAGS += -Werror
+endif
+
# warn about C99 declaration after statement
KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
# warn about C99 declaration after statement
KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
@@
-979,7
+983,7
@@
prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
include/config/auto.conf
$(cmd_crmodverdir)
include/config/auto.conf
$(cmd_crmodverdir)
-archprepare: archheaders prepare1 scripts_basic
+archprepare: archheaders
archscripts
prepare1 scripts_basic
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
prepare0: archprepare FORCE
$(Q)$(MAKE) $(build)=.
@@
-1049,8
+1053,11
@@
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
PHONY += archheaders
archheaders:
PHONY += archheaders
archheaders:
+PHONY += archscripts
+archscripts:
+
PHONY += __headers
PHONY += __headers
-__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE
+__headers: include/linux/version.h scripts_basic asm-generic archheaders
archscripts
FORCE
$(Q)$(MAKE) $(build)=scripts build_unifdef
PHONY += headers_install_all
$(Q)$(MAKE) $(build)=scripts build_unifdef
PHONY += headers_install_all