From 6298f309bddaf3f279a724034e2d1d3ce58e0e1a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 3 Dec 2015 17:20:15 +0200
Subject: Clean up rule names

---
 build/dist/module.cxx | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'build/dist')

diff --git a/build/dist/module.cxx b/build/dist/module.cxx
index a624c20..f0a446b 100644
--- a/build/dist/module.cxx
+++ b/build/dist/module.cxx
@@ -44,37 +44,39 @@ namespace build
       const dir_path& out_root (r.out_path ());
       level5 ([&]{trace << "for " << out_root;});
 
-      // Register meta-operation.
-      //
-      r.meta_operations.insert (dist_id, dist);
-
-      // Register our wildcard rule. Do it explicitly for the alias
-      // to prevent something like insert<target>(dist_id, test_id)
-      // taking precedence.
-      //
-      r.rules.insert<target> (dist_id, 0, "dist", rule_);
-      r.rules.insert<alias> (dist_id, 0, "alias", rule_);
-
       // Enter module variables.
       //
       if (first)
       {
-        var_pool.find ("dist", bool_type);
+        auto& v (var_pool);
+
+        v.find ("dist", bool_type);
 
-        var_pool.find ("dist.package", string_type);
+        v.find ("dist.package", string_type);
 
-        var_pool.find ("dist.root", dir_path_type);
-        var_pool.find ("config.dist.root", dir_path_type);
+        v.find ("dist.root", dir_path_type);
+        v.find ("config.dist.root", dir_path_type);
 
         //@@ VAR type
         //
-        var_pool.find ("dist.cmd", string_type);
-        var_pool.find ("config.dist.cmd", string_type);
+        v.find ("dist.cmd", string_type);
+        v.find ("config.dist.cmd", string_type);
 
-        var_pool.find ("dist.archives", strings_type);
-        var_pool.find ("config.dist.archives", strings_type);
+        v.find ("dist.archives", strings_type);
+        v.find ("config.dist.archives", strings_type);
       }
 
+      // Register meta-operation.
+      //
+      r.meta_operations.insert (dist_id, dist);
+
+      // Register our wildcard rule. Do it explicitly for the alias
+      // to prevent something like insert<target>(dist_id, test_id)
+      // taking precedence.
+      //
+      r.rules.insert<target> (dist_id, 0, "dist", rule_);
+      r.rules.insert<alias> (dist_id, 0, "dist.alias", rule_);
+
       // Configuration.
       //
       // Note that we don't use any defaults for root -- the location
-- 
cgit v1.1