aboutsummaryrefslogtreecommitdiff
path: root/build/cxx/rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-20 09:38:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-20 09:38:38 +0200
commit90ae462a44a1478e1c4be1568997b6873f6e688d (patch)
tree26af054dea912de192b243c174da23061c57c444 /build/cxx/rule.cxx
parentc23346c4cda9e0c2318c302dc6014d3fef53a6d3 (diff)
Rename 'directory' to 'dir' in target, prerequisite
Diffstat (limited to 'build/cxx/rule.cxx')
-rw-r--r--build/cxx/rule.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/cxx/rule.cxx b/build/cxx/rule.cxx
index 26ad213..1c7d992 100644
--- a/build/cxx/rule.cxx
+++ b/build/cxx/rule.cxx
@@ -68,7 +68,7 @@ namespace build
obj& o (dynamic_cast<obj&> (t));
if (o.path ().empty ())
- o.path (o.directory / path (o.name + ".o"));
+ o.path (o.dir / path (o.name + ".o"));
// Resolve prerequisite to target and match it to a rule. We need
// this in order to get the source file path for prerequisite
@@ -418,7 +418,7 @@ namespace build
exe& e (dynamic_cast<exe&> (t));
if (e.path ().empty ())
- e.path (e.directory / path (e.name));
+ e.path (e.dir / path (e.name));
// Do rule chaining for C and C++ source files.
//
@@ -439,17 +439,17 @@ namespace build
// possible it is under out_root (e.g., generated source).
//
path d;
- if (cp.directory.relative () || cp.directory.sub (out_root))
- d = cp.directory;
+ if (cp.dir.relative () || cp.dir.sub (out_root))
+ d = cp.dir;
else
{
- if (!cp.directory.sub (src_root))
+ if (!cp.dir.sub (src_root))
{
fail << "out of project prerequisite " << cp <<
info << "specify corresponding obj{} target explicitly";
}
- d = out_root / cp.directory.leaf (src_root);
+ d = out_root / cp.dir.leaf (src_root);
}
prerequisite& op (