From 47bf5cd6a167730ee06a1c7cffeae6540f67dde0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 14 Aug 2015 15:48:34 +0200
Subject: Rework meta/operation registration

We now have global tables for meta/operation. Plus each can
then be enabled on the per-project basis.
---
 build/install/module.cxx    | 4 +++-
 build/install/operation.cxx | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'build/install')

diff --git a/build/install/module.cxx b/build/install/module.cxx
index 1dd655e..834b0e8 100644
--- a/build/install/module.cxx
+++ b/build/install/module.cxx
@@ -104,8 +104,10 @@ namespace build
 
       // Register the install operation.
       //
-      assert (r.operations.insert (install) == install_id);
+      r.operations.insert (install_id, install);
 
+      // Register rules.
+      //
       {
         auto& rs (b.rules);
 
diff --git a/build/install/operation.cxx b/build/install/operation.cxx
index 1ba001f..1246671 100644
--- a/build/install/operation.cxx
+++ b/build/install/operation.cxx
@@ -4,8 +4,6 @@
 
 #include <build/install/operation>
 
-#include <build/config/operation>
-
 using namespace std;
 using namespace butl;
 
@@ -18,7 +16,7 @@ namespace build
     {
       // Run update as a pre-operation, unless we are disfiguring.
       //
-      return mo != config::disfigure_id ? update_id : 0;
+      return mo != disfigure_id ? update_id : 0;
     }
 
     operation_info install {
-- 
cgit v1.1