Skip to content

Commit 6dd3139

Browse files
W-M-Rxiaoxiang781216
authored andcommitted
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]>
1 parent 09b299d commit 6dd3139

File tree

19 files changed

+41
-444
lines changed

19 files changed

+41
-444
lines changed

libs/libc/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,13 @@ endif
173173

174174
# Context
175175

176-
context::
176+
bin:
177+
$(Q) mkdir $@
178+
179+
kbin:
180+
$(Q) mkdir $@
181+
182+
context:: bin kbin
177183
ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y)
178184
$(Q) $(MAKE) -C zoneinfo context BIN=$(BIN)
179185
endif
@@ -203,8 +209,6 @@ depend:: .depend
203209
# Clean most derived files, retaining the configuration
204210

205211
clean::
206-
$(Q) $(MAKE) -C bin clean
207-
$(Q) $(MAKE) -C kbin clean
208212
$(Q) $(MAKE) -C zoneinfo clean BIN=$(BIN)
209213
$(call DELFILE, $(BIN))
210214
$(call DELFILE, $(KBIN))
@@ -213,13 +217,11 @@ clean::
213217
# Deep clean -- removes all traces of the configuration
214218

215219
distclean:: clean
216-
$(Q) $(MAKE) -C bin distclean
217-
$(Q) $(MAKE) -C kbin distclean
218220
$(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN)
219221
$(call DELFILE, exec_symtab.c)
220-
$(call DELFILE, bin$(DELIM)Make.dep)
221-
$(call DELFILE, kbin$(DELIM)Make.dep)
222222
$(call DELFILE, .depend)
223+
$(call DELDIR, bin)
224+
$(call DELDIR, kbin)
223225

224226
-include bin$(DELIM)Make.dep
225227
-include kbin$(DELIM)Make.dep

libs/libc/bin/CMakeLists.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

libs/libc/bin/Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

libs/libc/kbin/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

libs/libc/kbin/Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

libs/libm/Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,26 @@ endif
8484

8585
depend: .depend
8686

87+
bin:
88+
$(Q) mkdir $@
89+
90+
kbin:
91+
$(Q) mkdir $@
92+
93+
context: bin kbin
94+
8795
# Clean most derived files, retaining the configuration
8896

8997
clean:
90-
$(Q) $(MAKE) -C bin clean
91-
$(Q) $(MAKE) -C kbin clean
9298
$(call DELFILE, $(BIN))
9399
$(call DELFILE, $(KBIN))
94100
$(call CLEAN)
95101

96102
# Deep clean -- removes all traces of the configuration
97103

98104
distclean:: clean
99-
$(Q) $(MAKE) -C bin distclean
100-
$(Q) $(MAKE) -C kbin distclean
101-
$(call DELFILE, bin$(DELIM)Make.dep)
102-
$(call DELFILE, kbin$(DELIM)Make.dep)
105+
$(call DELDIR, bin)
106+
$(call DELDIR, kbin)
103107
$(call DELFILE, .depend)
104108

105109
-include bin$(DELIM)Make.dep

libs/libm/bin/Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

libs/libm/kbin/Makefile

Lines changed: 0 additions & 35 deletions
This file was deleted.

libs/libnx/Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,17 @@ depend: .depend
241241

242242
# Generate configuration context
243243

244-
context: gensources
244+
bin:
245+
$(Q) mkdir $@
246+
247+
kbin:
248+
$(Q) mkdir $@
249+
250+
context:: gensources bin kbin
245251

246252
# Clean most derived files, retaining the configuration
247253

248254
clean:
249-
$(Q) $(MAKE) -C bin clean
250-
$(Q) $(MAKE) -C kbin clean
251255
$(Q) $(MAKE) -C nxfonts -f Makefile.sources clean EXTRAFLAGS="$(EXTRAFLAGS)"
252256
$(call DELFILE, $(BIN))
253257
$(call DELFILE, $(KBIN))
@@ -256,12 +260,10 @@ clean:
256260
# Deep clean -- removes all traces of the configuration
257261

258262
distclean: clean
259-
$(Q) $(MAKE) -C bin distclean
260-
$(Q) $(MAKE) -C kbin distclean
261-
$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean EXTRAFLAGS="$(EXTRAFLAGS)"
262-
$(call DELFILE, bin/Make.dep)
263-
$(call DELFILE, kbin/Make.dep)
263+
$(call DELDIR, bin)
264+
$(call DELDIR, kbin)
264265
$(call DELFILE, .depend)
266+
$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean EXTRAFLAGS="$(EXTRAFLAGS)"
265267

266268
-include bin/Make.dep
267269
-include kbin/Make.dep

libs/libnx/bin/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)