diff options
| author | Jerome Forissier <jerome.forissier@linaro.org> | 2018-02-06 14:22:29 +0100 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2018-05-04 15:58:52 +0200 |
| commit | ceae7156316bb24975a0eb6a3b62c02848af64eb (patch) | |
| tree | b6a68fea0718fb1403b5dff81ebebba12e280a6a /ta | |
| parent | d815ab4721f65936a46204ddce62d4b922000ec8 (diff) | |
TA dev kit: minor cleanup
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>
Diffstat (limited to 'ta')
| -rw-r--r-- | ta/mk/ta_dev_kit.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index 1e218d67..852323c5 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -7,19 +7,13 @@ all: include $(ta-dev-kit-dir)/mk/conf.mk +ifneq (1, $(word $(BINARY) $(LIBNAME))) +$(error You must specify exactly one of BINARY or LIBNAME) +endif + binary := $(BINARY) libname := $(LIBNAME) -ifneq ($(BINARY),) -ifneq ($(LIBNAME),) -$(error You can only specify one of BINARY or LIBNAME) -endif -else -ifeq ($(LIBNAME),) -$(error You must specify one of BINARY or LIBNAME) -endif -endif - ifneq ($O,) out-dir := $O else @@ -81,8 +75,8 @@ clean: subdirs = . include $(ta-dev-kit-dir)/mk/subdir.mk -#the build target is ta ifneq ($(binary),) +# Build target is TA vpath %.c $(ta-dev-kit-dir)/src srcs += user_ta_header.c endif @@ -91,8 +85,10 @@ include $(ta-dev-kit-dir)/mk/gcc.mk include $(ta-dev-kit-dir)/mk/compile.mk ifneq ($(binary),) include $(ta-dev-kit-dir)/mk/link.mk -else +endif + ifneq ($(libname),) +# Build target is static library all: $(libname).a cleanfiles += $(libname).a @@ -100,4 +96,3 @@ $(libname).a: $(objs) @echo ' AR $@' $(q)rm -f $@ && $(AR$(sm)) rcs -o $@ $^ endif -endif |