nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

makefile/build: Delete unnecessary bin and kbin folders

Browse source 
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 <wangmingrong1@xiaomi.com>
This commit is contained in:
wangmingrong1 2024-11-08 16:39:09 +08:00 committed by Xiang Xiao
parent 09b299d377
commit 6dd313939f
19 changed files with 41 additions and 444 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/libc/Makefile
View file

@ -173,7 +173,13 @@ endif
# Context # Context
context:: bin:
$(Q) mkdir $@
kbin:
$(Q) mkdir $@
context:: bin kbin
ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y) ifeq ($(CONFIG_LIBC_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo context BIN=$(BIN) $(Q) $(MAKE) -C zoneinfo context BIN=$(BIN)
endif endif
@ -203,8 +209,6 @@ depend:: .depend
# Clean most derived files, retaining the configuration # Clean most derived files, retaining the configuration
clean:: clean::
$(Q) $(MAKE) -C bin clean
$(Q) $(MAKE) -C kbin clean
$(Q) $(MAKE) -C zoneinfo clean BIN=$(BIN) $(Q) $(MAKE) -C zoneinfo clean BIN=$(BIN)
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, $(KBIN)) $(call DELFILE, $(KBIN))
@ -213,13 +217,11 @@ clean::
# Deep clean -- removes all traces of the configuration # Deep clean -- removes all traces of the configuration
distclean:: clean distclean:: clean
$(Q) $(MAKE) -C bin distclean
$(Q) $(MAKE) -C kbin distclean
$(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN) $(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN)
$(call DELFILE, exec_symtab.c) $(call DELFILE, exec_symtab.c)
$(call DELFILE, bin$(DELIM)Make.dep)
$(call DELFILE, kbin$(DELIM)Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
$(call DELDIR, bin)
$(call DELDIR, kbin)
-include bin$(DELIM)Make.dep -include bin$(DELIM)Make.dep
-include kbin$(DELIM)Make.dep -include kbin$(DELIM)Make.dep

21
libs/libc/bin/CMakeLists.txt
View file

@ -1,21 +0,0 @@
# ##############################################################################
# libs/libc/bin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

35
libs/libc/bin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libc/bin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

22
libs/libc/kbin/CMakeLists.txt
View file

@ -1,22 +0,0 @@
# ##############################################################################
# libs/libc/kbin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

35
libs/libc/kbin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libc/kbin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

16
libs/libm/Makefile
View file

@ -84,11 +84,17 @@ endif
depend: .depend depend: .depend
bin:
$(Q) mkdir $@
kbin:
$(Q) mkdir $@
context: bin kbin
# Clean most derived files, retaining the configuration # Clean most derived files, retaining the configuration
clean: clean:
$(Q) $(MAKE) -C bin clean
$(Q) $(MAKE) -C kbin clean
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, $(KBIN)) $(call DELFILE, $(KBIN))
$(call CLEAN) $(call CLEAN)
@ -96,10 +102,8 @@ clean:
# Deep clean -- removes all traces of the configuration # Deep clean -- removes all traces of the configuration
distclean:: clean distclean:: clean
$(Q) $(MAKE) -C bin distclean $(call DELDIR, bin)
$(Q) $(MAKE) -C kbin distclean $(call DELDIR, kbin)
$(call DELFILE, bin$(DELIM)Make.dep)
$(call DELFILE, kbin$(DELIM)Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include bin$(DELIM)Make.dep -include bin$(DELIM)Make.dep

35
libs/libm/bin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libm/bin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

35
libs/libm/kbin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libm/kbin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

18
libs/libnx/Makefile
View file

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

22
libs/libnx/bin/CMakeLists.txt
View file

@ -1,22 +0,0 @@
# ##############################################################################
# libs/libnx/bin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

35
libs/libnx/bin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libnx/bin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

22
libs/libnx/kbin/CMakeLists.txt
View file

@ -1,22 +0,0 @@
# ##############################################################################
# libs/libnx/kbin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

35
libs/libnx/kbin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# libs/libnx/kbin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

16
mm/Makefile
View file

@ -91,7 +91,13 @@ endif
# Dependencies # Dependencies
context:: bin:
$(Q) mkdir $@
kbin:
$(Q) mkdir $@
context:: bin kbin
makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call CATFILE, bin/Make.dep, $^) $(call CATFILE, bin/Make.dep, $^)
@ -113,8 +119,6 @@ depend: .depend
# Clean most derived files, retaining the configuration # Clean most derived files, retaining the configuration
clean: clean:
$(Q) $(MAKE) -C bin clean
$(Q) $(MAKE) -C kbin clean
$(call DELFILE, $(BIN)) $(call DELFILE, $(BIN))
$(call DELFILE, $(KBIN)) $(call DELFILE, $(KBIN))
$(call CLEAN) $(call CLEAN)
@ -122,10 +126,8 @@ clean:
# Deep clean -- removes all traces of the configuration # Deep clean -- removes all traces of the configuration
distclean:: clean distclean:: clean
$(Q) $(MAKE) -C bin distclean $(call DELDIR, bin)
$(Q) $(MAKE) -C kbin distclean $(call DELDIR, kbin)
$(call DELFILE, bin$(DELIM)Make.dep)
$(call DELFILE, kbin$(DELIM)Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include bin$(DELIM)Make.dep -include bin$(DELIM)Make.dep

21
mm/bin/CMakeLists.txt
View file

@ -1,21 +0,0 @@
############################################################################
# mm/bin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################

35
mm/bin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# mm/bin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

22
mm/kbin/CMakeLists.txt
View file

@ -1,22 +0,0 @@
############################################################################
# mm/kbin/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################

35
mm/kbin/Makefile
View file

@ -1,35 +0,0 @@
############################################################################
# mm/kbin/Makefile
#
# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
###########################################################################
include $(TOPDIR)/Make.defs
all:
.PHONY: clean distclean
# Clean Targets:
clean:
$(call CLEAN)
# Deep clean -- removes all traces of the configuration
distclean: clean

9
tools/Directories.mk
View file

@ -61,7 +61,7 @@ ifeq ($(EXTERNALDIR),external)
KERNDEPDIRS += external KERNDEPDIRS += external
endif endif
CONTEXTDIRS = boards drivers fs $(APPDIR) $(ARCH_SRC) CONTEXTDIRS = boards drivers fs $(APPDIR) $(ARCH_SRC) mm
CLEANDIRS += pass1 CLEANDIRS += pass1
ifeq ($(CONFIG_BUILD_FLAT),y) ifeq ($(CONFIG_BUILD_FLAT),y)
@ -145,11 +145,12 @@ KERNDEPDIRS += libs$(DELIM)libnx
else else
USERDEPDIRS += libs$(DELIM)libnx USERDEPDIRS += libs$(DELIM)libnx
endif endif
CONTEXTDIRS += libs$(DELIM)libnx
else else
CLEANDIRS += libs$(DELIM)libnx CLEANDIRS += libs$(DELIM)libnx
endif endif
CONTEXTDIRS += libs$(DELIM)libnx
ifeq ($(CONFIG_AUDIO),y) ifeq ($(CONFIG_AUDIO),y)
KERNDEPDIRS += audio KERNDEPDIRS += audio
else else
@ -195,8 +196,4 @@ else
CLEANDIRS += openamp CLEANDIRS += openamp
endif endif
ifeq ($(CONFIG_MM_TLSF_MANAGER),y)
CONTEXTDIRS += mm
endif
CLEANDIRS += $(KERNDEPDIRS) $(USERDEPDIRS) CLEANDIRS += $(KERNDEPDIRS) $(USERDEPDIRS)