Skip to content

Commit 50a3399

Browse files
committed
kbuild: fix inconsistent indentation in top Makefile
Commit 3b9ab24 ("kbuild: use 4-space indentation when followed by conditionals") introduced inconsistent indentation because it deliberately touched only the conditional directives to minimize the change set. This commit reformats some blocks in the top Makefile so they are consistently indented with 4 spaces. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]>
1 parent 5270316 commit 50a3399

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Diff for: Makefile

+16-16
Original file line numberDiff line numberDiff line change
@@ -295,51 +295,51 @@ single-build :=
295295

296296
ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
297297
ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)
298-
need-config :=
298+
need-config :=
299299
endif
300300
endif
301301

302302
ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)
303303
ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)
304-
may-sync-config :=
304+
may-sync-config :=
305305
endif
306306
endif
307307

308308
need-compiler := $(may-sync-config)
309309

310310
ifneq ($(KBUILD_EXTMOD),)
311-
may-sync-config :=
311+
may-sync-config :=
312312
endif
313313

314314
ifeq ($(KBUILD_EXTMOD),)
315-
ifneq ($(filter %config,$(MAKECMDGOALS)),)
316-
config-build := 1
317-
ifneq ($(words $(MAKECMDGOALS)),1)
318-
mixed-build := 1
319-
endif
315+
ifneq ($(filter %config,$(MAKECMDGOALS)),)
316+
config-build := 1
317+
ifneq ($(words $(MAKECMDGOALS)),1)
318+
mixed-build := 1
320319
endif
320+
endif
321321
endif
322322

323323
# We cannot build single targets and the others at the same time
324324
ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),)
325-
single-build := 1
325+
single-build := 1
326326
ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),)
327-
mixed-build := 1
327+
mixed-build := 1
328328
endif
329329
endif
330330

331331
# For "make -j clean all", "make -j mrproper defconfig all", etc.
332332
ifneq ($(filter $(clean-targets),$(MAKECMDGOALS)),)
333-
ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),)
334-
mixed-build := 1
335-
endif
333+
ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),)
334+
mixed-build := 1
335+
endif
336336
endif
337337

338338
# install and modules_install need also be processed one by one
339339
ifneq ($(filter install,$(MAKECMDGOALS)),)
340-
ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
341-
mixed-build := 1
342-
endif
340+
ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
341+
mixed-build := 1
342+
endif
343343
endif
344344

345345
ifdef mixed-build

0 commit comments

Comments
 (0)