Remove SRCLIBDIR definition from the top Makefile
All submakefiles have sensible defaults (either .. or ../..), so there is no need to fiddle with whitespaces in the dir name.
This commit is contained in:
parent
d0d23cff07
commit
72274d3caf
8
Makefile
8
Makefile
|
@ -22,10 +22,6 @@ PREFIX ?= arm-none-eabi-
|
||||||
STYLECHECK := scripts/checkpatch.pl
|
STYLECHECK := scripts/checkpatch.pl
|
||||||
STYLECHECKFLAGS := --no-tree -f --terse --mailback
|
STYLECHECKFLAGS := --no-tree -f --terse --mailback
|
||||||
|
|
||||||
space:=
|
|
||||||
space+=
|
|
||||||
SRCLIBDIR:= $(subst $(space),\$(space),$(realpath lib))
|
|
||||||
|
|
||||||
TARGETS ?= stm32/f0 stm32/f1 stm32/f2 stm32/f3 stm32/f4 stm32/f7 \
|
TARGETS ?= stm32/f0 stm32/f1 stm32/f2 stm32/f3 stm32/f4 stm32/f7 \
|
||||||
stm32/l0 stm32/l1 stm32/l4 \
|
stm32/l0 stm32/l1 stm32/l4 \
|
||||||
stm32/g0 \
|
stm32/g0 \
|
||||||
|
@ -70,7 +66,7 @@ LIB_DIRS:=$(wildcard $(addprefix lib/,$(TARGETS)))
|
||||||
$(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
|
$(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
|
||||||
$(Q)$(RM) .stamp_failure_$(subst /,_,$@)
|
$(Q)$(RM) .stamp_failure_$(subst /,_,$@)
|
||||||
@printf " BUILD $@\n";
|
@printf " BUILD $@\n";
|
||||||
$(Q)$(MAKE) --directory=$@ SRCLIBDIR="$(SRCLIBDIR)" PREFIX="$(PREFIX)" || \
|
$(Q)$(MAKE) --directory=$@ PREFIX="$(PREFIX)" || \
|
||||||
echo "Failure building: $@: code: $$?" > .stamp_failure_$(subst /,_,$@)
|
echo "Failure building: $@: code: $$?" > .stamp_failure_$(subst /,_,$@)
|
||||||
|
|
||||||
lib: $(LIB_DIRS)
|
lib: $(LIB_DIRS)
|
||||||
|
@ -88,7 +84,7 @@ clean: $(IRQ_DEFN_FILES:=.cleanhdr) $(LIB_DIRS:=.clean) $(EXAMPLE_DIRS:=.clean)
|
||||||
%.clean:
|
%.clean:
|
||||||
$(Q)if [ -d $* ]; then \
|
$(Q)if [ -d $* ]; then \
|
||||||
printf " CLEAN $*\n"; \
|
printf " CLEAN $*\n"; \
|
||||||
$(MAKE) -C $* clean SRCLIBDIR="$(SRCLIBDIR)" || exit $?; \
|
$(MAKE) -C $* clean || exit $?; \
|
||||||
fi;
|
fi;
|
||||||
$(Q)$(RM) .stamp_failure_*;
|
$(Q)$(RM) .stamp_failure_*;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue