diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-10-30 11:06:13 +0900 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-07 16:27:07 -0500 |
commit | 176d09827725e82ad3f628f7a33ebbc4e93aa41a (patch) | |
tree | 74fe9fcf8f6cd98e68147b81021f9c5ee4555f91 /scripts/Makefile.build | |
parent | ad618992f7199fe93c3ecc3dd397ec0bef575933 (diff) | |
download | u-boot-imx-176d09827725e82ad3f628f7a33ebbc4e93aa41a.zip u-boot-imx-176d09827725e82ad3f628f7a33ebbc4e93aa41a.tar.gz u-boot-imx-176d09827725e82ad3f628f7a33ebbc4e93aa41a.tar.bz2 |
kbuild: sync misc scripts with Linux 3.18-rc1
This commit imports some updates in misc scripts from Linux 3.18-rc1.
[1] commit cbb4d3e6510b99522719c5ef0 by Horia Geanta
scripts/kernel-doc: handle object-like macros
[2] commit 164f0d2efaaef83 by Michal Marek
kbuild: Fix handling of backslashes in *.cmd files
[3] commit 270a00963cd367214e by Randy Dunlap
scripts/kernel-doc: recognize __meminit
[4] commit a4954fd7724c0f55361eb5 by Masahiro Yamada
kbuild: remove obj-n and lib-n handling
[5] commit 5b2389b45d1a9c12b9f by Masahiro Yamada
kbuild: simplify build, clean, modbuiltin shorthands
Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'scripts/Makefile.build')
-rw-r--r-- | scripts/Makefile.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 3e12b57..14cf092 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -97,11 +97,11 @@ endif # =========================================================================== -ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),) +ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),) lib-target := $(obj)/lib.a endif -ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),) +ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),) builtin-target := $(obj)/built-in.o endif |