diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-11-11 14:35:49 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-17 14:11:30 -0500 |
| commit | 3fdf5c8e94e7a2a62f98ea8f0ad1a84d18eccfbf (patch) | |
| tree | 3dab4e224c21e02ede9259e40ab502b9e9770ffe /scripts | |
| parent | 620110afe5909ab66643581bc07c830369bb867b (diff) | |
| download | u-boot-imx-3fdf5c8e94e7a2a62f98ea8f0ad1a84d18eccfbf.zip u-boot-imx-3fdf5c8e94e7a2a62f98ea8f0ad1a84d18eccfbf.tar.gz u-boot-imx-3fdf5c8e94e7a2a62f98ea8f0ad1a84d18eccfbf.tar.bz2 | |
Makefile: abolish COBJS, SOBJS, etc.
The support for COBJS, COBJS-y, SOBJS, SOBJS-y, GLCOBJS, GLSOBJS
from scripts/Makefile.build.
Going forward we need to use Kbuild style consistently.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 2ef7341..805c3c3 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -10,10 +10,6 @@ SRCS := include Makefile -# Backward compatible: obj-y is preferable -COBJS := $(sort $(COBJS) $(COBJS-y)) -SOBJS := $(sort $(SOBJS) $(SOBJS-y)) - # Going forward use the following obj-y := $(sort $(obj-y)) extra-y := $(sort $(extra-y)) @@ -24,11 +20,11 @@ obj-y := $(patsubst %/, %/built-in.o, $(obj-y)) subdir-obj-y := $(filter %/built-in.o, $(obj-y)) subdir-obj-y := $(addprefix $(obj),$(subdir-obj-y)) -SRCS += $(COBJS:.o=.c) $(SOBJS:.o=.S) \ - $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S)) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y)) +SRCS += $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \ + $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S)) +OBJS := $(addprefix $(obj),$(obj-y)) -LGOBJS := $(addprefix $(obj),$(sort $(GLSOBJS) $(GLCOBJS)) $(lib-y)) +LGOBJS := $(addprefix $(obj),$(sort $(lib-y))) all: $(LIB) $(addprefix $(obj),$(extra-y)) |