From a1cec9e0df14f3c1a833e2a447b5324ff9c430d3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 21 Jul 2015 16:21:07 +0200
Subject: Test module genesis

---
 build/context.cxx | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'build/context.cxx')

diff --git a/build/context.cxx b/build/context.cxx
index 9b22478..9d9c322 100644
--- a/build/context.cxx
+++ b/build/context.cxx
@@ -28,12 +28,6 @@ namespace build
   const operation_info* current_oif;
   execution_mode current_mode;
 
-  // Builtin rules.
-  //
-  static alias_rule alias_;
-  static fsdir_rule fsdir_;
-  static file_rule file_;
-
   void
   reset ()
   {
@@ -77,17 +71,17 @@ namespace build
     {
       rule_map& rs (global_scope->rules);
 
-      rs.insert<alias> (default_id, "alias", alias_);
-      rs.insert<alias> (update_id, "alias", alias_);
-      rs.insert<alias> (clean_id, "alias", alias_);
+      rs.insert<alias> (default_id, "alias", alias_rule::instance);
+      rs.insert<alias> (update_id, "alias", alias_rule::instance);
+      rs.insert<alias> (clean_id, "alias", alias_rule::instance);
 
-      rs.insert<fsdir> (default_id, "fsdir", fsdir_);
-      rs.insert<fsdir> (update_id, "fsdir", fsdir_);
-      rs.insert<fsdir> (clean_id, "fsdir", fsdir_);
+      rs.insert<fsdir> (default_id, "fsdir", fsdir_rule::instance);
+      rs.insert<fsdir> (update_id, "fsdir", fsdir_rule::instance);
+      rs.insert<fsdir> (clean_id, "fsdir", fsdir_rule::instance);
 
-      rs.insert<file> (default_id, "file", file_);
-      rs.insert<file> (update_id, "file", file_);
-      rs.insert<file> (clean_id, "file", file_);
+      rs.insert<file> (default_id, "file", file_rule::instance);
+      rs.insert<file> (update_id, "file", file_rule::instance);
+      rs.insert<file> (clean_id, "file", file_rule::instance);
     }
   }
 
-- 
cgit v1.1