diff options
-rw-r--r-- | Makefile | 26 |
1 files changed, 9 insertions, 17 deletions
@@ -35,10 +35,8 @@ MAKEFLAGS += -rR --no-print-directory | |||
35 | # To put more focus on warnings, be less verbose as default | 35 | # To put more focus on warnings, be less verbose as default |
36 | # Use 'make V=1' to see the full commands | 36 | # Use 'make V=1' to see the full commands |
37 | 37 | ||
38 | ifdef V | 38 | ifeq ("$(origin V)", "command line") |
39 | ifeq ("$(origin V)", "command line") | 39 | KBUILD_VERBOSE = $(V) |
40 | KBUILD_VERBOSE = $(V) | ||
41 | endif | ||
42 | endif | 40 | endif |
43 | ifndef KBUILD_VERBOSE | 41 | ifndef KBUILD_VERBOSE |
44 | KBUILD_VERBOSE = 0 | 42 | KBUILD_VERBOSE = 0 |
@@ -54,10 +52,8 @@ endif | |||
54 | # See the file "Documentation/sparse.txt" for more details, including | 52 | # See the file "Documentation/sparse.txt" for more details, including |
55 | # where to get the "sparse" utility. | 53 | # where to get the "sparse" utility. |
56 | 54 | ||
57 | ifdef C | 55 | ifeq ("$(origin C)", "command line") |
58 | ifeq ("$(origin C)", "command line") | 56 | KBUILD_CHECKSRC = $(C) |
59 | KBUILD_CHECKSRC = $(C) | ||
60 | endif | ||
61 | endif | 57 | endif |
62 | ifndef KBUILD_CHECKSRC | 58 | ifndef KBUILD_CHECKSRC |
63 | KBUILD_CHECKSRC = 0 | 59 | KBUILD_CHECKSRC = 0 |
@@ -69,12 +65,10 @@ endif | |||
69 | ifdef SUBDIRS | 65 | ifdef SUBDIRS |
70 | KBUILD_EXTMOD ?= $(SUBDIRS) | 66 | KBUILD_EXTMOD ?= $(SUBDIRS) |
71 | endif | 67 | endif |
72 | ifdef M | ||
73 | ifeq ("$(origin M)", "command line") | ||
74 | KBUILD_EXTMOD := $(M) | ||
75 | endif | ||
76 | endif | ||
77 | 68 | ||
69 | ifeq ("$(origin M)", "command line") | ||
70 | KBUILD_EXTMOD := $(M) | ||
71 | endif | ||
78 | 72 | ||
79 | # kbuild supports saving output files in a separate directory. | 73 | # kbuild supports saving output files in a separate directory. |
80 | # To locate output files in a separate directory two syntaxes are supported. | 74 | # To locate output files in a separate directory two syntaxes are supported. |
@@ -98,10 +92,8 @@ ifeq ($(KBUILD_SRC),) | |||
98 | 92 | ||
99 | # OK, Make called in directory where kernel src resides | 93 | # OK, Make called in directory where kernel src resides |
100 | # Do we want to locate output files in a separate directory? | 94 | # Do we want to locate output files in a separate directory? |
101 | ifdef O | 95 | ifeq ("$(origin O)", "command line") |
102 | ifeq ("$(origin O)", "command line") | 96 | KBUILD_OUTPUT := $(O) |
103 | KBUILD_OUTPUT := $(O) | ||
104 | endif | ||
105 | endif | 97 | endif |
106 | 98 | ||
107 | # That's our default target when none is given on the command line | 99 | # That's our default target when none is given on the command line |