From 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 20 Jan 2018 13:46:11 +0200
Subject: Get rid of action rule override semantics

Instead we now have two more or less separate match states for outer and
inner parts of an action.
---
 build2/cc/module.hxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'build2/cc/module.hxx')

diff --git a/build2/cc/module.hxx b/build2/cc/module.hxx
index de61611..58aa184 100644
--- a/build2/cc/module.hxx
+++ b/build2/cc/module.hxx
@@ -13,9 +13,9 @@
 
 #include <build2/cc/common.hxx>
 
-#include <build2/cc/compile.hxx>
-#include <build2/cc/link.hxx>
-#include <build2/cc/install.hxx>
+#include <build2/cc/compile-rule.hxx>
+#include <build2/cc/link-rule.hxx>
+#include <build2/cc/install-rule.hxx>
 
 namespace build2
 {
@@ -76,19 +76,19 @@ namespace build2
     };
 
     class module: public module_base, public virtual common,
-                  link,
-                  compile,
-                  file_install,
-                  alias_install
+                  link_rule,
+                  compile_rule,
+                  install_rule,
+                  libux_install_rule
     {
     public:
       explicit
       module (data&& d)
           : common (move (d)),
-            link (move (d)),
-            compile (move (d)),
-            file_install (move (d), *this),
-            alias_install (move (d), *this) {}
+            link_rule (move (d)),
+            compile_rule (move (d)),
+            install_rule (move (d), *this),
+            libux_install_rule (move (d), *this) {}
 
       void
       init (scope&, const location&, const variable_map&);
-- 
cgit v1.1