Fix clean and distclean targets. Back out a few too many changes made by sed

Makefile

@@ -125,8 +125,8 @@ $(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),all)))
 $(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),install)))
 $(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),context)))
 $(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),depend)))
-$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),clean)))
-$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),distclean)))
+$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
+$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
 
 $(BIN): $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_all)
 
@@ -151,11 +151,11 @@ context: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_context)
 
 depend: .depend
 
-clean: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_clean)
+clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
 	$(call DELFILE, $(BIN))
 	$(call CLEAN)
 
-distclean: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_distclean)
+distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 	$(Q) ( if exist  external ( \
 		echo ********************************************************" \
@@ -171,6 +171,6 @@ else
 	)
 endif
 	$(call DELFILE, .depend)
-	$(call DELDIR, bin)
+	$(call DELDIR, $(INSTALL_DIR))
 
 

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
 

examples/elf/tests/errno/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/hello/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

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)

examples/elf/tests/longjmp/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/mutex/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/pthread/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/signal/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/struct/Makefile

@@ -84,6 +84,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/elf/tests/task/Makefile

@@ -83,6 +83,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) mkdir -p $(ROMFS_DIR)
 	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

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
 

examples/nxflat/tests/errno/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

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)

examples/nxflat/tests/hello/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/longjmp/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/mutex/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/pthread/Makefile

@@ -78,6 +78,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/signal/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/struct/Makefile

@@ -79,6 +79,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 

examples/nxflat/tests/task/Makefile

@@ -77,7 +77,6 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
 

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; )

examples/thttpd/content/hello/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
 

examples/thttpd/content/netstat/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
 

examples/thttpd/content/tasks/Makefile

@@ -77,6 +77,5 @@ clean:
 	$(call CLEAN)
 
 install:
-
 	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)