You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/02/27 10:43:04 UTC
[incubator-nuttx-apps] branch pr106 updated (4c4d8b1 -> 740cb5b)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch pr106
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 4c4d8b1 examples/elf: update elf_main.c dependency to fix parallel build break
new a572ff0 example/module/drivers: Ensure "build" before "install"
new 740cb5b examples/nxflat/tests: Ensure "build" before "install"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/module/drivers/Makefile | 8 ++++----
examples/module/drivers/chardev/Makefile | 2 +-
examples/nxflat/tests/Makefile | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
[incubator-nuttx-apps] 02/02: examples/nxflat/tests: Ensure "build"
before "install"
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr106
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 740cb5b8d975b04c2c20b60345ed981a7100e9c2
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Feb 27 18:09:57 2020 +0800
examples/nxflat/tests: Ensure "build" before "install"
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
examples/nxflat/tests/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/nxflat/tests/Makefile b/examples/nxflat/tests/Makefile
index 544cd02..d065bbc 100644
--- a/examples/nxflat/tests/Makefile
+++ b/examples/nxflat/tests/Makefile
@@ -54,16 +54,16 @@ ROMFS_DIRLIST = $(TESTS_DIR)/dirlist.h
SYMTAB = $(TESTS_DIR)/symtab.h
define DIR_template
-$(1)_$(2):
+$(1)_$(2): $(4)
+$(Q) $(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)" CROSSDEV=$(CROSSDEV)
endef
all: $(ROMFS_HDR) $(ROMFS_DIRLIST) $(SYMTAB)
.PHONY: all build clean install populate
-$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all)))
-$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean)))
-$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install)))
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build,all,)))
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean,)))
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install,$(DIR)_build)))
# Build program(s) in each sud-directory
[incubator-nuttx-apps] 01/02: example/module/drivers: Ensure
"build" before "install"
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr106
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit a572ff01255e185ecfcc35b1f66fd5f5b3d8cf61
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Feb 27 13:42:57 2020 +0800
example/module/drivers: Ensure "build" before "install"
Change-Id: I7b95d8f751da4889012b129f6036f7cdc2ed7ec9
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
examples/module/drivers/Makefile | 8 ++++----
examples/module/drivers/chardev/Makefile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/module/drivers/Makefile b/examples/module/drivers/Makefile
index 45a7b11..bddb359 100644
--- a/examples/module/drivers/Makefile
+++ b/examples/module/drivers/Makefile
@@ -58,16 +58,16 @@ else ifeq ($(CONFIG_EXAMPLES_MODULE_CROMFS),y)
endif
define DIR_template
-$(1)_$(2):
+$(1)_$(2): $(4)
+$(Q) $(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" FSROOT_DIR="$(FSROOT_DIR)" CROSSDEV=$(CROSSDEV)
endef
all: $(FSIMG_HDR) $(DIRLIST_HDR) $(SYMTAB_SRC) $(PASS1_SYMTAB)
.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)))
+$(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)))
# Build program(s) in each sud-directory
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index 5b290d5..ea646cb 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -92,6 +92,6 @@ clean:
$(call DELFILE, $(BIN))
$(call CLEAN)
-install: $(BIN)
+install:
$(Q) mkdir -p $(FSROOT_DIR)
$(Q) install $(BIN) $(FSROOT_DIR)/$(BIN)