Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions examples/nxflat/tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,24 @@

include $(APPDIR)/Make.defs

# Most of these do no build yet
#SUBDIRS = errno hello hello++ longjmp mutex pthread signal task struct
SUBDIRS = errno hello struct
# hello++ is left out: two of its four modules convert, the third needs
# R_ARM_TARGET1 from the converter and the fourth needs an iostream.

SUBDIRS = errno hello signal struct

# longjmp imports setjmp() and longjmp(), which the symbol table exports only
# where NuttX supplies them itself.

ifeq ($(CONFIG_ARCH_SETJMP_H),y)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move to the first patch

SUBDIRS += longjmp
endif

ifneq ($(CONFIG_DISABLE_PTHREAD),y)
BUILD_SUBDIRS += mutex pthread
SUBDIRS += mutex pthread
endif

ifneq ($(CONFIG_ARCH_ADDRENV),y)
BUILD_SUBDIRS += task
SUBDIRS += task
endif

NXFLAT_DIR = $(APPDIR)/examples/nxflat
Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/errno/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
12 changes: 8 additions & 4 deletions examples/nxflat/tests/hello++/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,20 @@ $(BIN3): $(BIN3).r2
# $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN1): $(BIN1)
$(Q) install -D $(BIN1) $(ROMFS_DIR)/$(BIN1)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN1) $(ROMFS_DIR)/$(BIN1)

$(ROMFS_DIR)/$(BIN2): $(BIN2)
$(Q) install -D $(BIN2) $(ROMFS_DIR)/$(BIN2)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN2) $(ROMFS_DIR)/$(BIN2)

$(ROMFS_DIR)/$(BIN3): $(BIN3)
$(Q) install -D $(BIN3) $(ROMFS_DIR)/$(BIN3)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN3) $(ROMFS_DIR)/$(BIN3)

#$(ROMFS_DIR)/$(BIN4): $(BIN4)
# $(Q) install -D $(BIN4) $(ROMFS_DIR)/$(BIN4)
# $(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN4) $(ROMFS_DIR)/$(BIN4)

install: $(ROMFS_DIR)/$(BIN1) $(ROMFS_DIR)/$(BIN2) $(ROMFS_DIR)/$(BIN3)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/hello/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/longjmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/mutex/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/pthread/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/signal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/struct/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
3 changes: 2 additions & 1 deletion examples/nxflat/tests/task/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ $(BIN): $(BIN).r2
$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^

$(ROMFS_DIR)/$(BIN): $(BIN)
$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
$(Q) mkdir -p $(ROMFS_DIR)
$(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN)

install: $(ROMFS_DIR)/$(BIN)

Expand Down
Loading