diff options
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 7 | ||||
| -rw-r--r-- | scripts/Makefile.build | 2 | ||||
| -rw-r--r-- | scripts/Makefile.clean | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index e38bbcf4e80a..2616a58a5a4b 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -6,7 +6,7 @@ This document describes the Linux kernel Makefiles. === 1 Overview === 2 Who does what - === 3 The kbuild Makefiles + === 3 The kbuild files --- 3.1 Goal definitions --- 3.2 Built-in object goals - obj-y --- 3.3 Loadable module goals - obj-m @@ -101,11 +101,14 @@ These people need to know about all aspects of the kernel Makefiles. This document is aimed towards normal developers and arch developers. -=== 3 The kbuild Makefiles +=== 3 The kbuild files Most Makefiles within the kernel are kbuild Makefiles that use the kbuild infrastructure. This chapter introduce the syntax used in the kbuild makefiles. +The preferred name for the kbuild files is 'Kbuild' but 'Makefile' will +continue to be supported. All new developmen is expected to use the +Kbuild filename. Section 3.1 "Goal definitions" is a quick intro, further chapters provide more details, with real examples. diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 672b0082e21f..352d531ee3c1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -10,7 +10,7 @@ __build: # Read .config if it exist, otherwise ignore -include .config -include $(obj)/Makefile +include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile) include scripts/Makefile.lib diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index b02ab1fb28e3..ff3e87dbf387 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -7,7 +7,7 @@ src := $(obj) .PHONY: __clean __clean: -include $(obj)/Makefile +include $(if $(wildcard $(obj)/Kbuild), $(obj)/Kbuild, $(obj)/Makefile) # Figure out what we need to build from the various variables # ========================================================================== |