diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 08:28:24 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 08:28:24 -0600 |
commit | dfbcec0bde2500b34356050537ca9d85c694412b (patch) | |
tree | 97fa70a473aee69ecaadfb99ef887357ac4491e2 /apps/examples | |
parent | 2b733b9165d1407c63d4a6997d51edd14bbf44d4 (diff) | |
download | nuttx-dfbcec0bde2500b34356050537ca9d85c694412b.tar.gz nuttx-dfbcec0bde2500b34356050537ca9d85c694412b.tar.bz2 nuttx-dfbcec0bde2500b34356050537ca9d85c694412b.zip |
Fix clean and distclean targets. Back out a few too many changes made by sed
Diffstat (limited to 'apps/examples')
24 files changed, 5 insertions, 29 deletions
diff --git a/apps/examples/elf/tests/Makefile b/apps/examples/elf/tests/Makefile index 480a898b9..17732c775 100644 --- a/apps/examples/elf/tests/Makefile +++ b/apps/examples/elf/tests/Makefile @@ -82,8 +82,7 @@ build: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: - $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_install) +install: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_install) # Create the romfs directory diff --git a/apps/examples/elf/tests/errno/Makefile b/apps/examples/elf/tests/errno/Makefile index 719468cd1..89e3f2bfd 100644 --- a/apps/examples/elf/tests/errno/Makefile +++ b/apps/examples/elf/tests/errno/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile index 32206be58..f89759a66 100644 --- a/apps/examples/elf/tests/hello/Makefile +++ b/apps/examples/elf/tests/hello/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile index a85485b40..cd153bd52 100644 --- a/apps/examples/elf/tests/helloxx/Makefile +++ b/apps/examples/elf/tests/helloxx/Makefile @@ -139,8 +139,7 @@ clean: $(call DELFILE, $(BIN4)) $(call CLEAN) -install: - $(ALL_BIN) +install: $(ALL_BIN) $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN1) $(ROMFS_DIR)/$(BIN1) $(Q) install $(BIN2) $(ROMFS_DIR)/$(BIN2) diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile index 4c9f89aad..26fa393bd 100644 --- a/apps/examples/elf/tests/longjmp/Makefile +++ b/apps/examples/elf/tests/longjmp/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile index 93be0d29a..f8ce4f613 100644 --- a/apps/examples/elf/tests/mutex/Makefile +++ b/apps/examples/elf/tests/mutex/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index 23d31d486..9d4ce496b 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile index 6aeb26235..c442ae9c6 100644 --- a/apps/examples/elf/tests/signal/Makefile +++ b/apps/examples/elf/tests/signal/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile index 0ccfac249..8fe7cf710 100644 --- a/apps/examples/elf/tests/struct/Makefile +++ b/apps/examples/elf/tests/struct/Makefile @@ -84,6 +84,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/task/Makefile b/apps/examples/elf/tests/task/Makefile index 8cda9e0cc..572d1072e 100644 --- a/apps/examples/elf/tests/task/Makefile +++ b/apps/examples/elf/tests/task/Makefile @@ -83,6 +83,5 @@ clean: $(call CLEAN) install: - $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index e6af69f16..8a65d6494 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -63,8 +63,7 @@ build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: - $(foreach DIR, $(SUBDIRS), $(DIR)_install) +install: $(foreach DIR, $(SUBDIRS), $(DIR)_install) # Create the romfs directory diff --git a/apps/examples/nxflat/tests/errno/Makefile b/apps/examples/nxflat/tests/errno/Makefile index 38413d806..d161a6496 100644 --- a/apps/examples/nxflat/tests/errno/Makefile +++ b/apps/examples/nxflat/tests/errno/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/hello++/Makefile b/apps/examples/nxflat/tests/hello++/Makefile index 3568730f1..fb8922a1b 100644 --- a/apps/examples/nxflat/tests/hello++/Makefile +++ b/apps/examples/nxflat/tests/hello++/Makefile @@ -175,8 +175,7 @@ clean: $(call DELFILE, *.r2) $(call CLEAN) -install: - $(ALL_BIN) +install: $(ALL_BIN) $(Q) install -D $(BIN1) $(ROMFS_DIR)/$(BIN1) $(Q) install -D $(BIN2) $(ROMFS_DIR)/$(BIN2) $(Q) install -D $(BIN3) $(ROMFS_DIR)/$(BIN3) diff --git a/apps/examples/nxflat/tests/hello/Makefile b/apps/examples/nxflat/tests/hello/Makefile index c3ce689cd..2efa6dbca 100644 --- a/apps/examples/nxflat/tests/hello/Makefile +++ b/apps/examples/nxflat/tests/hello/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/longjmp/Makefile b/apps/examples/nxflat/tests/longjmp/Makefile index 902119057..dbfd5fc91 100644 --- a/apps/examples/nxflat/tests/longjmp/Makefile +++ b/apps/examples/nxflat/tests/longjmp/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/mutex/Makefile b/apps/examples/nxflat/tests/mutex/Makefile index 05a9d0962..526099819 100644 --- a/apps/examples/nxflat/tests/mutex/Makefile +++ b/apps/examples/nxflat/tests/mutex/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/pthread/Makefile b/apps/examples/nxflat/tests/pthread/Makefile index 4a583ea46..e16a8f623 100644 --- a/apps/examples/nxflat/tests/pthread/Makefile +++ b/apps/examples/nxflat/tests/pthread/Makefile @@ -78,6 +78,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/signal/Makefile b/apps/examples/nxflat/tests/signal/Makefile index 65fafc8bc..43e4742b5 100644 --- a/apps/examples/nxflat/tests/signal/Makefile +++ b/apps/examples/nxflat/tests/signal/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/struct/Makefile b/apps/examples/nxflat/tests/struct/Makefile index b1767d0e9..bee07d1e5 100644 --- a/apps/examples/nxflat/tests/struct/Makefile +++ b/apps/examples/nxflat/tests/struct/Makefile @@ -79,6 +79,5 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/task/Makefile b/apps/examples/nxflat/tests/task/Makefile index 531d62143..afd4754b6 100644 --- a/apps/examples/nxflat/tests/task/Makefile +++ b/apps/examples/nxflat/tests/task/Makefile @@ -77,7 +77,6 @@ clean: $(call CLEAN) install: - $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile index 561bcbf3c..9ef8fe98a 100644 --- a/apps/examples/thttpd/content/Makefile +++ b/apps/examples/thttpd/content/Makefile @@ -62,8 +62,7 @@ build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: - $(foreach DIR, $(SUBDIRS), $(DIR)_install) +install: $(foreach DIR, $(SUBDIRS), $(DIR)_install) @( for file in $(INSTALL_FILES); do\ install -m 0644 -D $${file} $(ROMFS_DIR)/$${file}; \ done; ) diff --git a/apps/examples/thttpd/content/hello/Makefile b/apps/examples/thttpd/content/hello/Makefile index 0273c7a98..2856490ab 100644 --- a/apps/examples/thttpd/content/hello/Makefile +++ b/apps/examples/thttpd/content/hello/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) diff --git a/apps/examples/thttpd/content/netstat/Makefile b/apps/examples/thttpd/content/netstat/Makefile index 232731cd9..6d89bcd88 100644 --- a/apps/examples/thttpd/content/netstat/Makefile +++ b/apps/examples/thttpd/content/netstat/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) diff --git a/apps/examples/thttpd/content/tasks/Makefile b/apps/examples/thttpd/content/tasks/Makefile index 7c6e01231..418fca2b3 100644 --- a/apps/examples/thttpd/content/tasks/Makefile +++ b/apps/examples/thttpd/content/tasks/Makefile @@ -77,6 +77,5 @@ clean: $(call CLEAN) install: - $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) |