diff --git a/libs/libc/Makefile b/libs/libc/Makefile index e07442cbb04..fb0f2d79f12 100644 --- 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 deleted file mode 100644 index fea4d0ab13c..00000000000 --- a/libs/libc/bin/CMakeLists.txt +++ /dev/null @@ -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. -# -# ############################################################################## diff --git a/libs/libc/bin/Makefile b/libs/libc/bin/Makefile deleted file mode 100644 index 735ba9133f2..00000000000 --- a/libs/libc/bin/Makefile +++ /dev/null @@ -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 diff --git a/libs/libc/kbin/CMakeLists.txt b/libs/libc/kbin/CMakeLists.txt deleted file mode 100644 index 50be8cb28f4..00000000000 --- a/libs/libc/kbin/CMakeLists.txt +++ /dev/null @@ -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. -# -# ############################################################################## - diff --git a/libs/libc/kbin/Makefile b/libs/libc/kbin/Makefile deleted file mode 100644 index 90cb1895b9d..00000000000 --- a/libs/libc/kbin/Makefile +++ /dev/null @@ -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 diff --git a/libs/libm/Makefile b/libs/libm/Makefile index f3dd77d6fed..841f53d544e 100644 --- a/libs/libm/Makefile +++ b/libs/libm/Makefile @@ -84,11 +84,17 @@ 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) @@ -96,10 +102,8 @@ 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 deleted file mode 100644 index db15a994aa7..00000000000 --- a/libs/libm/bin/Makefile +++ /dev/null @@ -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 diff --git a/libs/libm/kbin/Makefile b/libs/libm/kbin/Makefile deleted file mode 100644 index ce9d1532ee8..00000000000 --- a/libs/libm/kbin/Makefile +++ /dev/null @@ -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 diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile index ba77144d62e..f9ab938f47e 100644 --- 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 deleted file mode 100644 index 7fafff5924f..00000000000 --- a/libs/libnx/bin/CMakeLists.txt +++ /dev/null @@ -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. -# -# ############################################################################## - diff --git a/libs/libnx/bin/Makefile b/libs/libnx/bin/Makefile deleted file mode 100644 index f4d6b0eafb6..00000000000 --- a/libs/libnx/bin/Makefile +++ /dev/null @@ -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 diff --git a/libs/libnx/kbin/CMakeLists.txt b/libs/libnx/kbin/CMakeLists.txt deleted file mode 100644 index 12168ff7e38..00000000000 --- a/libs/libnx/kbin/CMakeLists.txt +++ /dev/null @@ -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. -# -# ############################################################################## - diff --git a/libs/libnx/kbin/Makefile b/libs/libnx/kbin/Makefile deleted file mode 100644 index ee4d64c7a04..00000000000 --- a/libs/libnx/kbin/Makefile +++ /dev/null @@ -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 diff --git a/mm/Makefile b/mm/Makefile index 4b03bf6a96d..53eb8bd72d2 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -91,7 +91,13 @@ endif # Dependencies -context:: +bin: + $(Q) mkdir $@ + +kbin: + $(Q) mkdir $@ + +context:: bin kbin makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) $(call CATFILE, bin/Make.dep, $^) @@ -113,8 +119,6 @@ depend: .depend # 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) @@ -122,10 +126,8 @@ 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/mm/bin/CMakeLists.txt b/mm/bin/CMakeLists.txt deleted file mode 100644 index feecd2a0a17..00000000000 --- a/mm/bin/CMakeLists.txt +++ /dev/null @@ -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. -# -########################################################################### diff --git a/mm/bin/Makefile b/mm/bin/Makefile deleted file mode 100644 index c391c25f1ce..00000000000 --- a/mm/bin/Makefile +++ /dev/null @@ -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 diff --git a/mm/kbin/CMakeLists.txt b/mm/kbin/CMakeLists.txt deleted file mode 100644 index 7cec6898a67..00000000000 --- a/mm/kbin/CMakeLists.txt +++ /dev/null @@ -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. -# -########################################################################### - diff --git a/mm/kbin/Makefile b/mm/kbin/Makefile deleted file mode 100644 index ff2d943c516..00000000000 --- a/mm/kbin/Makefile +++ /dev/null @@ -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 diff --git a/tools/Directories.mk b/tools/Directories.mk index 672c4a48eb4..c3395fe2907 100644 --- a/tools/Directories.mk +++ b/tools/Directories.mk @@ -61,7 +61,7 @@ ifeq ($(EXTERNALDIR),external) KERNDEPDIRS += external endif -CONTEXTDIRS = boards drivers fs $(APPDIR) $(ARCH_SRC) +CONTEXTDIRS = boards drivers fs $(APPDIR) $(ARCH_SRC) mm CLEANDIRS += pass1 ifeq ($(CONFIG_BUILD_FLAT),y) @@ -145,11 +145,12 @@ KERNDEPDIRS += libs$(DELIM)libnx else USERDEPDIRS += libs$(DELIM)libnx endif -CONTEXTDIRS += libs$(DELIM)libnx else CLEANDIRS += libs$(DELIM)libnx endif +CONTEXTDIRS += libs$(DELIM)libnx + ifeq ($(CONFIG_AUDIO),y) KERNDEPDIRS += audio else @@ -195,8 +196,4 @@ else CLEANDIRS += openamp endif -ifeq ($(CONFIG_MM_TLSF_MANAGER),y) -CONTEXTDIRS += mm -endif - CLEANDIRS += $(KERNDEPDIRS) $(USERDEPDIRS)