[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 1ce38fb 2/6: Rename $(build_directory) to the
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 1ce38fb 2/6: Rename $(build_directory) to the terser $(build_dir) |
Date: |
Wed, 24 Apr 2019 16:47:17 -0400 (EDT) |
branch: master
commit 1ce38fb2ad7c732e3ad9bc7591df00a12c9736c3
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename $(build_directory) to the terser $(build_dir)
---
GNUmakefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 9911c34..ac073d6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -173,7 +173,7 @@ $(srcdir)/local_options.make:: ;
build_type ?= ship
toolset ?= gcc
-build_directory := \
+build_dir := \
$(srcdir)/../build/$(notdir $(srcdir))/$(uname)/$(toolset)/$(build_type)
gpl_files := \
@@ -212,12 +212,12 @@ MAKETARGET = \
yyyymmddhhmm='$(yyyymmddhhmm)' \
$(MAKECMDGOALS)
-.PHONY: $(build_directory)
-$(build_directory): $(gpl_files)
+.PHONY: $(build_dir)
+$(build_dir): $(gpl_files)
address@hidden -d $@ ] || $(MKDIR) --parents $@
address@hidden(MAKETARGET)
-% :: $(build_directory) ; @:
+% :: $(build_dir) ; @:
################################################################################
@@ -333,7 +333,7 @@ source_clean:
.PHONY: clean
clean: source_clean
- -$(RM) --force --recursive $(build_directory)
+ -$(RM) --force --recursive $(build_dir)
.PHONY: distclean mostlyclean maintainer-clean
distclean mostlyclean maintainer-clean: clean
@@ -352,7 +352,7 @@ raze: clobber
# Custom tools built from source.
-TEST_CODING_RULES := $(build_directory)/test_coding_rules$(EXEEXT)
+TEST_CODING_RULES := $(build_dir)/test_coding_rules$(EXEEXT)
.PHONY: custom_tools
custom_tools:
@@ -363,7 +363,7 @@ custom_tools:
# Check conformity to certain formatting rules; count lines and defects.
#
-# The tests in $(build_directory) identify object ('.o') files with no
+# The tests in $(build_dir) identify object ('.o') files with no
# corresponding autodependency ('.d') file, and zero-byte '.d' files.
# Either of these suggests a build failure that may render dependency
# files invalid; 'make clean' should provide symptomatic relief.
@@ -395,8 +395,8 @@ check_concinnity: source_clean custom_tools
@[ -f md5sums ] \
&& <md5sums $(SED)
-e'/\.test$$\|\.test0$$\|\.test1$$\|\.tsv$$\|\.xml$$/d' \
| $(MD5SUM) --check --quiet || true
- @for z in $(build_directory)/*.d; do [ -s $$z ] || echo $$z;
done;
- @for z in $(build_directory)/*.o; do [ -f $${z%%.o}.d ] || echo $$z;
done;
+ @for z in $(build_dir)/*.d; do [ -s $$z ] || echo $$z; done;
+ @for z in $(build_dir)/*.o; do [ -f $${z%%.o}.d ] || echo $$z; done;
@$(LS) --classify ./* \
| $(SED) -e'/\*$$/!d' -e'/^\.\//!d' -e'/.sh\*$$/d' -e'/.sed\*$$/d' \
| $(SED) -e's/^/Improperly executable: /'
- [lmi-commits] [lmi] master updated (254138c -> e3a3984), Greg Chicares, 2019/04/24
- [lmi-commits] [lmi] master e3a3984 6/6: Eliminate an undesirable conditional, Greg Chicares, 2019/04/24
- [lmi-commits] [lmi] master 0bb144d 5/6: Rename makefile variable: s/toolset/toolchain/, Greg Chicares, 2019/04/24
- [lmi-commits] [lmi] master fd91b93 3/6: Reorder 'clean' targets, Greg Chicares, 2019/04/24
- [lmi-commits] [lmi] master 1ce38fb 2/6: Rename $(build_directory) to the terser $(build_dir),
Greg Chicares <=
- [lmi-commits] [lmi] master c6b5903 1/6: Remove obsolete documentation that has become misleading, Greg Chicares, 2019/04/24
- [lmi-commits] [lmi] master 4e8d281 4/6: Relocate lmi's build directory, Greg Chicares, 2019/04/24