aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-04-28 03:32:43 -0400
committerMichal Marek <mmarek@suse.cz>2014-04-30 11:34:35 -0400
commit3fbb43df983acf6f10a122e43e73daf6528ad7ed (patch)
tree2f35c8cf4f9f3dc1e21b73fe1a6b4828419426d1
parent38385f8f0180322513a6350234737fbc02172d06 (diff)
kbuild: trivial - fix comment block indent
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile33
1 files changed, 16 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 1571fdfaf154..d25c7de06d59 100644
--- a/Makefile
+++ b/Makefile
@@ -255,18 +255,18 @@ endif
255KBUILD_MODULES := 255KBUILD_MODULES :=
256KBUILD_BUILTIN := 1 256KBUILD_BUILTIN := 1
257 257
258# If we have only "make modules", don't compile built-in objects. 258# If we have only "make modules", don't compile built-in objects.
259# When we're building modules with modversions, we need to consider 259# When we're building modules with modversions, we need to consider
260# the built-in objects during the descend as well, in order to 260# the built-in objects during the descend as well, in order to
261# make sure the checksums are up to date before we record them. 261# make sure the checksums are up to date before we record them.
262 262
263ifeq ($(MAKECMDGOALS),modules) 263ifeq ($(MAKECMDGOALS),modules)
264 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1) 264 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
265endif 265endif
266 266
267# If we have "make <whatever> modules", compile modules 267# If we have "make <whatever> modules", compile modules
268# in addition to whatever we do anyway. 268# in addition to whatever we do anyway.
269# Just "make" or "make all" shall build modules as well 269# Just "make" or "make all" shall build modules as well
270 270
271ifneq ($(filter all _all modules,$(MAKECMDGOALS)),) 271ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
272 KBUILD_MODULES := 1 272 KBUILD_MODULES := 1
@@ -342,7 +342,6 @@ $(srctree)/scripts/Kbuild.include: ;
342include $(srctree)/scripts/Kbuild.include 342include $(srctree)/scripts/Kbuild.include
343 343
344# Make variables (CC, etc...) 344# Make variables (CC, etc...)
345
346AS = $(CROSS_COMPILE)as 345AS = $(CROSS_COMPILE)as
347LD = $(CROSS_COMPILE)ld 346LD = $(CROSS_COMPILE)ld
348CC = $(CROSS_COMPILE)gcc 347CC = $(CROSS_COMPILE)gcc
@@ -781,10 +780,10 @@ MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
781export MODLIB 780export MODLIB
782 781
783# 782#
784# INSTALL_MOD_STRIP, if defined, will cause modules to be 783# INSTALL_MOD_STRIP, if defined, will cause modules to be
785# stripped after they are installed. If INSTALL_MOD_STRIP is '1', then 784# stripped after they are installed. If INSTALL_MOD_STRIP is '1', then
786# the default option --strip-debug will be used. Otherwise, 785# the default option --strip-debug will be used. Otherwise,
787# INSTALL_MOD_STRIP value will be used as the options to the strip command. 786# INSTALL_MOD_STRIP value will be used as the options to the strip command.
788 787
789ifdef INSTALL_MOD_STRIP 788ifdef INSTALL_MOD_STRIP
790ifeq ($(INSTALL_MOD_STRIP),1) 789ifeq ($(INSTALL_MOD_STRIP),1)
@@ -1027,11 +1026,11 @@ ifdef CONFIG_MODULES
1027 1026
1028all: modules 1027all: modules
1029 1028
1030# Build modules 1029# Build modules
1031# 1030#
1032# A module can be listed more than once in obj-m resulting in 1031# A module can be listed more than once in obj-m resulting in
1033# duplicate lines in modules.order files. Those are removed 1032# duplicate lines in modules.order files. Those are removed
1034# using awk while concatenating to the final file. 1033# using awk while concatenating to the final file.
1035 1034
1036PHONY += modules 1035PHONY += modules
1037modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin 1036modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -1110,7 +1109,7 @@ CLEAN_DIRS += $(MODVERDIR)
1110 1109
1111# Directories & files removed with 'make mrproper' 1110# Directories & files removed with 'make mrproper'
1112MRPROPER_DIRS += include/config usr/include include/generated \ 1111MRPROPER_DIRS += include/config usr/include include/generated \
1113 arch/*/include/generated .tmp_objdiff 1112 arch/*/include/generated .tmp_objdiff
1114MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ 1113MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
1115 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ 1114 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
1116 signing_key.priv signing_key.x509 x509.genkey \ 1115 signing_key.priv signing_key.x509 x509.genkey \