diff options
| -rw-r--r-- | scripts/Makefile.build | 6 | ||||
| -rw-r--r-- | scripts/Makefile.clean | 2 | ||||
| -rw-r--r-- | scripts/Makefile.host | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 67fb4530a6ff..277cfe0b7100 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -27,12 +27,12 @@ ccflags-y := | |||
| 27 | cppflags-y := | 27 | cppflags-y := |
| 28 | ldflags-y := | 28 | ldflags-y := |
| 29 | 29 | ||
| 30 | # Read .config if it exist, otherwise ignore | 30 | # Read auto.conf if it exists, otherwise ignore |
| 31 | -include include/config/auto.conf | 31 | -include include/config/auto.conf |
| 32 | 32 | ||
| 33 | include scripts/Kbuild.include | 33 | include scripts/Kbuild.include |
| 34 | 34 | ||
| 35 | # For backward compatibility check that these variables does not change | 35 | # For backward compatibility check that these variables do not change |
| 36 | save-cflags := $(CFLAGS) | 36 | save-cflags := $(CFLAGS) |
| 37 | 37 | ||
| 38 | # The filename Kbuild has precedence over Makefile | 38 | # The filename Kbuild has precedence over Makefile |
| @@ -55,7 +55,7 @@ hostprogs-y += $(host-progs) | |||
| 55 | endif | 55 | endif |
| 56 | endif | 56 | endif |
| 57 | 57 | ||
| 58 | # Do not include host rules unles needed | 58 | # Do not include host rules unless needed |
| 59 | ifneq ($(hostprogs-y)$(hostprogs-m),) | 59 | ifneq ($(hostprogs-y)$(hostprogs-m),) |
| 60 | include scripts/Makefile.host | 60 | include scripts/Makefile.host |
| 61 | endif | 61 | endif |
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 2c647107c9cc..6f89fbb56256 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean | |||
| @@ -37,7 +37,7 @@ subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-)) | |||
| 37 | 37 | ||
| 38 | subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) | 38 | subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn)) |
| 39 | 39 | ||
| 40 | # build a list of files to remove, usually releative to the current | 40 | # build a list of files to remove, usually relative to the current |
| 41 | # directory | 41 | # directory |
| 42 | 42 | ||
| 43 | __clean-files := $(extra-y) $(always) \ | 43 | __clean-files := $(extra-y) $(always) \ |
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 6943a7a5bb98..1ac414fd5030 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | # Binaries are used during the compilation of the kernel, for example | 3 | # Binaries are used during the compilation of the kernel, for example |
| 4 | # to preprocess a data file. | 4 | # to preprocess a data file. |
| 5 | # | 5 | # |
| 6 | # Both C and C++ is supported, but preferred language is C for such utilities. | 6 | # Both C and C++ are supported, but preferred language is C for such utilities. |
| 7 | # | 7 | # |
| 8 | # Samle syntax (see Documentation/kbuild/makefile.txt for reference) | 8 | # Sample syntax (see Documentation/kbuild/makefiles.txt for reference) |
| 9 | # hostprogs-y := bin2hex | 9 | # hostprogs-y := bin2hex |
| 10 | # Will compile bin2hex.c and create an executable named bin2hex | 10 | # Will compile bin2hex.c and create an executable named bin2hex |
| 11 | # | 11 | # |
| @@ -23,10 +23,10 @@ | |||
| 23 | # hostprogs-y := conf | 23 | # hostprogs-y := conf |
| 24 | # conf-objs := conf.o libkconfig.so | 24 | # conf-objs := conf.o libkconfig.so |
| 25 | # libkconfig-objs := expr.o type.o | 25 | # libkconfig-objs := expr.o type.o |
| 26 | # Will create a shared library named libkconfig.so that consist of | 26 | # Will create a shared library named libkconfig.so that consists of |
| 27 | # expr.o and type.o (they are both compiled as C code and the object file | 27 | # expr.o and type.o (they are both compiled as C code and the object files |
| 28 | # are made as position independent code). | 28 | # are made as position independent code). |
| 29 | # conf.c is compiled as a c program, and conf.o is linked together with | 29 | # conf.c is compiled as a C program, and conf.o is linked together with |
| 30 | # libkconfig.so as the executable conf. | 30 | # libkconfig.so as the executable conf. |
| 31 | # Note: Shared libraries consisting of C++ files are not supported | 31 | # Note: Shared libraries consisting of C++ files are not supported |
| 32 | 32 | ||
| @@ -61,7 +61,7 @@ host-cobjs := $(filter-out %.so,$(host-cobjs)) | |||
| 61 | host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs)))) | 61 | host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs)))) |
| 62 | 62 | ||
| 63 | # output directory for programs/.o files | 63 | # output directory for programs/.o files |
| 64 | # hostprogs-y := tools/build may have been specified. Retreive directory | 64 | # hostprogs-y := tools/build may have been specified. Retrieve directory |
| 65 | host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f)))) | 65 | host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f)))) |
| 66 | # directory of .o files from prog-objs notation | 66 | # directory of .o files from prog-objs notation |
| 67 | host-objdirs += $(foreach f,$(host-cmulti), \ | 67 | host-objdirs += $(foreach f,$(host-cmulti), \ |
