Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Build system: Move all build-related files (except the top-level Makefile) into the tools/ sub-directory. This really cleans up the top-level directory.

Browse source
This commit is contained in:
Gregory Nutt 2018-05-29 12:14:55 -06:00
parent f2a89813f2
commit 53a4408428
9 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,7 +1,7 @@
############################################################################
# Makefile
#
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -43,7 +43,7 @@
-include .config
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
include Makefile.win
include tools/Makefile.win
else
include Makefile.unix
include tools/Makefile.unix
endif

2
Directories.mk → tools/Directories.mk
View file

@ -1,5 +1,5 @@
############################################################################
# Directories.mk
# tools/Directories.mk
#
# Copyright (C) 2007-2012, 2014, 2016-2017 Gregory Nutt. All rights
# reserved.

2
FlatLibs.mk → tools/FlatLibs.mk
View file

@ -1,5 +1,5 @@
############################################################################
# FlatLibs.mk
# tools/FlatLibs.mk
#
# Copyright (C) 2007-2012, 2014, 2016-2018 Gregory Nutt. All rights
# reserved.

2
KernelLibs.mk → tools/KernelLibs.mk
View file

@ -1,5 +1,5 @@
############################################################################
# KernelLibs.mk
# tools/KernelLibs.mk
#
# Copyright (C) 2014, 2016, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

2
LibTargets.mk → tools/LibTargets.mk
View file

@ -1,5 +1,5 @@
############################################################################
# LibTargets.mk
# tools/LibTargets.mk
#
# Copyright (C) 2007-2012, 2014, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

12
Makefile.unix → tools/Makefile.unix
View file

@ -1,5 +1,5 @@
############################################################################
# Makefile.unix
# tools/Makefile.unix
#
# Copyright (C) 2007-2012, 2014-2015, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -120,7 +120,7 @@ APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APP
# then this holds only the directories containing user files. If
# CONFIG_BUILD_KERNEL is selected, then applications are not build at all.
include Directories.mk
include tools/Directories.mk
#
# Extra objects used in the final link.
@ -145,12 +145,12 @@ endif
# 'make export' is
ifeq ($(CONFIG_BUILD_PROTECTED),y)
include ProtectedLibs.mk
include tools/ProtectedLibs.mk
else
ifeq ($(CONFIG_BUILD_KERNEL),y)
include KernelLibs.mk
include tools/KernelLibs.mk
else
include FlatLibs.mk
include tools/FlatLibs.mk
endif
endif
@ -381,7 +381,7 @@ check_context:
# execution will then be built from those libraries. The following targets
# build those libraries.
include LibTargets.mk
include tools/LibTargets.mk
# pass1 and pass2
#

12
Makefile.win → tools/Makefile.win
View file

@ -1,5 +1,5 @@
############################################################################
# Makefile.win
# tools/Makefile.win
#
# Copyright (C) 2012, 2015, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@ -113,7 +113,7 @@ APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR)
# then this holds only the directories containing user files. If
# CONFIG_BUILD_KERNEL is selected, then applications are not build at all.
include Directories.mk
include tools\Directories.mk
#
# Extra objects used in the final link.
@ -138,12 +138,12 @@ endif
# 'make export' is
ifeq ($(CONFIG_BUILD_PROTECTED),y)
include ProtectedLibs.mk
include tools\ProtectedLibs.mk
else
ifeq ($(CONFIG_BUILD_KERNEL),y)
include KernelLibs.mk
include tools\KernelLibs.mk
else
include FlatLibs.mk
include tools\FlatLibs.mk
endif
endif
@ -393,7 +393,7 @@ check_context:
# execution will then be built from those libraries. The following targets
# build those libraries.
include LibTargets.mk
include tools/LibTargets.mk
# pass1 and pass2
#

2
ProtectedLibs.mk → tools/ProtectedLibs.mk
View file

@ -1,5 +1,5 @@
############################################################################
# ProtectedLibs.mk
# tools/ProtectedLibs.mk
#
# Copyright (C) 2007-2012, 2014, 2016-2018 Gregory Nutt. All rights
# reserved.

18
tools/README.txt
View file

@ -12,10 +12,19 @@ README.txt
This file!
Config.mk
Makefile.*
----------
Makefile.unix is the Makefile used when building NuttX in Unix-like
systems. It is selected from the top-level Makefile.
Makefile.win is the Makefile used when building natively under
Windows. It is selected from the top-level Makefile.
*.mk
---------
This file contains common definitions used by many configuration files.
Config.mk contains common definitions used by many configuration files.
This file (along with <nuttx>/.config) must be included at the top of
each configuration-specific Make.defs file like:
@ -25,6 +34,11 @@ Config.mk
Subsequent logic within the configuration-specific Make.defs file may then
override these default definitions as necessary.
Libraries.mk has the build rules for all NuttX libraries.
FlatLibs.mk, ProtectedLibs.mk, and KernelLib.mk: These control the
selection of libraries to be built, depending on the selected build mode.
configure.sh
configure.bat
configure.c, cfgparser.c, and cfgparser.h