You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/03/22 21:47:29 UTC
[incubator-nuttx-apps] 02/04: Revert "examples/elf/tests: Ensure
"build" before "install""
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr136
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 8a7ea1695dfb243a42d2ca56f3e90bd6cac4822f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Mar 17 17:53:35 2020 +0800
Revert "examples/elf/tests: Ensure "build" before "install""
This reverts commit 2abf0f50e1556f1aeea500c4d2b1df58b1d09aee.
---
examples/elf/tests/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/elf/tests/Makefile b/examples/elf/tests/Makefile
index 1f0c987..1acf640 100644
--- a/examples/elf/tests/Makefile
+++ b/examples/elf/tests/Makefile
@@ -76,16 +76,16 @@ else
endif
define DIR_template
-$(1)_$(2): $(4)
+$(1)_$(2):
+$(Q) $(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" FSIMG_DIR="$(FSIMG_DIR)" CROSSDEV=$(CROSSDEV)
endef
all: $(FSIMG_HDR) $(DIRLIST_HDR) $(SYMTAB_SRC)
.PHONY: all build clean install populate
-$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),build,all,)))
-$(foreach DIR, $(ALL_SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean,)))
-$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install,$(DIR)_build)))
+$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all)))
+$(foreach DIR, $(ALL_SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean)))
+$(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install)))
# Build program(s) in each sud-directory