makefile/build: Delete unnecessary bin and kbin folders

1. Calling CLEAN on these folders did not have any effect 2. bin,kbin will be created during the context construction process Signed-off-by: wangmingrong1 <[email protected]>
nuttxpr · Nov 9, 2024 · 6dd3139 · 6dd3139
1 parent 09b299d
commit 6dd3139
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 444 deletions.
diff --git a/libs/libc/Makefile b/libs/libc/Makefile
@@ -173,7 +173,13 @@ endif
 
 # Context
 
-context::
+bin:
+	$(Q) mkdir $@
+
+kbin:
+	$(Q) mkdir $@
+
+context:: bin kbin
 ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y)
 	$(Q) $(MAKE) -C zoneinfo context BIN=$(BIN)
 endif
@@ -203,8 +209,6 @@ depend:: .depend
 # Clean most derived files, retaining the configuration
 
 clean::
-	$(Q) $(MAKE) -C bin  clean
-	$(Q) $(MAKE) -C kbin clean
 	$(Q) $(MAKE) -C zoneinfo clean BIN=$(BIN)
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(KBIN))
@@ -213,13 +217,11 @@ clean::
 # Deep clean -- removes all traces of the configuration
 
 distclean:: clean
-	$(Q) $(MAKE) -C bin  distclean
-	$(Q) $(MAKE) -C kbin distclean
 	$(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN)
 	$(call DELFILE, exec_symtab.c)
-	$(call DELFILE, bin$(DELIM)Make.dep)
-	$(call DELFILE, kbin$(DELIM)Make.dep)
 	$(call DELFILE, .depend)
+	$(call DELDIR, bin)
+	$(call DELDIR, kbin)
 
 -include bin$(DELIM)Make.dep
 -include kbin$(DELIM)Make.dep
diff --git a/libs/libc/bin/CMakeLists.txt b/libs/libc/bin/CMakeLists.txt
diff --git a/libs/libc/bin/Makefile b/libs/libc/bin/Makefile
diff --git a/libs/libc/kbin/CMakeLists.txt b/libs/libc/kbin/CMakeLists.txt
diff --git a/libs/libc/kbin/Makefile b/libs/libc/kbin/Makefile
diff --git a/libs/libm/Makefile b/libs/libm/Makefile
@@ -84,22 +84,26 @@ endif
 
 depend: .depend
 
+bin:
+	$(Q) mkdir $@
+
+kbin:
+	$(Q) mkdir $@
+
+context: bin kbin
+
 # Clean most derived files, retaining the configuration
 
 clean:
-	$(Q) $(MAKE) -C bin  clean
-	$(Q) $(MAKE) -C kbin clean
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(KBIN))
 	$(call CLEAN)
 
 # Deep clean -- removes all traces of the configuration
 
 distclean:: clean
-	$(Q) $(MAKE) -C bin  distclean
-	$(Q) $(MAKE) -C kbin distclean
-	$(call DELFILE, bin$(DELIM)Make.dep)
-	$(call DELFILE, kbin$(DELIM)Make.dep)
+	$(call DELDIR, bin)
+	$(call DELDIR, kbin)
 	$(call DELFILE, .depend)
 
 -include bin$(DELIM)Make.dep

diff --git a/libs/libm/bin/Makefile b/libs/libm/bin/Makefile
diff --git a/libs/libm/kbin/Makefile b/libs/libm/kbin/Makefile
diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile
@@ -241,13 +241,17 @@ depend: .depend
 
 # Generate configuration context
 
-context: gensources
+bin:
+	$(Q) mkdir $@
+
+kbin:
+	$(Q) mkdir $@
+
+context:: gensources bin kbin
 
 # Clean most derived files, retaining the configuration
 
 clean:
-	$(Q) $(MAKE) -C bin  clean
-	$(Q) $(MAKE) -C kbin clean
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources clean EXTRAFLAGS="$(EXTRAFLAGS)"
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(KBIN))
@@ -256,12 +260,10 @@ clean:
 # Deep clean -- removes all traces of the configuration
 
 distclean: clean
-	$(Q) $(MAKE) -C bin  distclean
-	$(Q) $(MAKE) -C kbin distclean
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean EXTRAFLAGS="$(EXTRAFLAGS)"
-	$(call DELFILE, bin/Make.dep)
-	$(call DELFILE, kbin/Make.dep)
+	$(call DELDIR, bin)
+	$(call DELDIR, kbin)
 	$(call DELFILE, .depend)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean EXTRAFLAGS="$(EXTRAFLAGS)"
 
 -include bin/Make.dep
 -include kbin/Make.dep
diff --git a/libs/libnx/bin/CMakeLists.txt b/libs/libnx/bin/CMakeLists.txt
diff --git a/libs/libnx/bin/Makefile b/libs/libnx/bin/Makefile
diff --git a/libs/libnx/kbin/CMakeLists.txt b/libs/libnx/kbin/CMakeLists.txt