Deal with order dependence in dist rule

1 files changed, 12 insertions, 2 deletions

diff --git a/libbuild2/dist/module.hxx b/libbuild2/dist/module.hxx
index 9c682d0..dbe2a3e 100644
--- a/libbuild2/dist/module.hxx
+++ b/libbuild2/dist/module.hxx
@@ -10,14 +10,19 @@
 #include <libbuild2/module.hxx>
 #include <libbuild2/variable.hxx>
 
+#include <libbuild2/dist/types.hxx>
+#include <libbuild2/dist/rule.hxx>
+
 #include <libbuild2/export.hxx>
 
 namespace build2
 {
   namespace dist
   {
-    struct LIBBUILD2_SYMEXPORT module: build2::module
+    class LIBBUILD2_SYMEXPORT module: public build2::module,
+                                      public rule
     {
+    public:
       static const string name;
 
       const variable& var_dist_package;
@@ -38,6 +43,10 @@ namespace build2
         adhoc.push_back (move (f));
       }
 
+      // List of postponed prerequisites.
+      //
+      postponed_prerequisites postponed;
+
       // Distribution post-processing callbacks.
       //
       // Only the last component in the pattern may contain wildcards. If the
@@ -69,8 +78,9 @@ namespace build2
 
       // Implementation details.
       //
+    public:
       module (const variable& v_d_p)
-          : var_dist_package (v_d_p) {}
+        : rule (postponed), var_dist_package (v_d_p) {}
 
     public:
       bool distributed = false; // True if this project is being distributed.