Rename OBJFILES to BUILD

This is more consistent with having simple names for variables. Also, this
contains all the build intermediate products, not just object files.

Signed-off-by: Christophe de Dinechin <christophe@dinechin.org>
This commit is contained in:
Christophe de Dinechin 2020-09-01 22:11:55 +02:00
parent ff92a7386f
commit 445cae64ae
3 changed files with 8 additions and 8 deletions

View File

@ -133,11 +133,11 @@ The output of the build will be located by default in the top-level
directory for the build, or the directory specified by the `OUTPUT` directory for the build, or the directory specified by the `OUTPUT`
environment variable if it's set. environment variable if it's set.
Temoprary files are placed in the `.objects` directory, or the Temoprary files are placed in the `.build` directory, or the
directory set by the `OBJFILES` environment variable if it's set. directory set by the `BUILD` environment variable if it's set.
There are subdirectories corresponding to the build environment and There are subdirectories corresponding to the build environment and
the build target, so the final product could be for instance under the build target, so the final product could be for instance under
`.objects/macosx-clang/opt/hello`. This is explained below. `.build/macosx-clang/opt/hello`. This is explained below.
The log files will be located by default in `.logs`, the latest The log files will be located by default in `.logs`, the latest
one being called `make.log`, or in the directory specified by the one being called `make.log`, or in the directory specified by the
@ -295,8 +295,8 @@ Some of the most useful environment variables include:
* `OUTPUT` is the directory where all build products should go. The * `OUTPUT` is the directory where all build products should go. The
default is the `$(TOP)`. default is the `$(TOP)`.
* `OBJFILES` is the directory where all build intermediate files * `BUILD` is the directory where all build intermediate files
should go. The default is `.objects/` in `$(TOP) should go. The default is `.build/` in `$(TOP)
* `LOGS` is the directory where all logs should go. The default is * `LOGS` is the directory where all logs should go. The default is
`.logs/` in `$(TOP)`. `.logs/` in `$(TOP)`.

View File

@ -55,7 +55,7 @@ TOP?=$(abspath .)/
OUTPUT?=$(TOP) OUTPUT?=$(TOP)
# Default location for object files # Default location for object files
OBJFILES?= $(TOP).objects/ BUILD?= $(TOP).build/
# Default location for build logs # Default location for build logs
LOGS?=$(TOP).logs/ LOGS?=$(TOP).logs/

View File

@ -119,7 +119,7 @@ MIQ_FULLDIR:= $(abspath .)/
MIQ_DIR:= $(subst $(abspath $(TOP))/,,$(MIQ_FULLDIR)) MIQ_DIR:= $(subst $(abspath $(TOP))/,,$(MIQ_FULLDIR))
MIQ_PRETTYDIR:= $(subst $(abspath $(TOP))/,[top],$(MIQ_FULLDIR)$(VARIANT:%=[%])) MIQ_PRETTYDIR:= $(subst $(abspath $(TOP))/,[top],$(MIQ_FULLDIR)$(VARIANT:%=[%]))
MIQ_BUILDDATE:= $(shell /bin/date '+%Y%m%d-%H%M%S') MIQ_BUILDDATE:= $(shell /bin/date '+%Y%m%d-%H%M%S')
MIQ_OBJROOT:= $(OBJFILES)$(BUILDENV)/$(CROSS_COMPILE:%=%-)$(TARGET) MIQ_OBJROOT:= $(BUILD)$(BUILDENV)/$(CROSS_COMPILE:%=%-)$(TARGET)
MIQ_BUILDLOG:= $(LOGS)build-$(BUILDENV)-$(CROSS_COMPILE:%=%-)$(TARGET)-$(MIQ_BUILDDATE).log MIQ_BUILDLOG:= $(LOGS)build-$(BUILDENV)-$(CROSS_COMPILE:%=%-)$(TARGET)-$(MIQ_BUILDDATE).log
endif endif
@ -229,7 +229,7 @@ NEWS: .ALWAYS
$(PRINT_GENERATE) $(GEN_NEWS) $(PRINT_GENERATE) $(GEN_NEWS)
distclean nuke: clean distclean nuke: clean
-$(PRINT_CLEAN) rm -rf $(MIQ_OUTPRODS) $(OBJFILES) $(LOGS) $(MIQ_TARBALL) -$(PRINT_CLEAN) rm -rf $(MIQ_OUTPRODS) $(BUILD) $(LOGS) $(MIQ_TARBALL)
help: help:
@$(ECHO) "Available targets:" @$(ECHO) "Available targets:"