Always prepare cmdline to avoid some dependency hassle

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 5deb2344b3c00ed72d6253ad0d294d502ba25a89..805b64a09a891ecbea2c2039c1a7c60379b672fd 100644 (file)
--- a/source/target.h
+++ b/source/target.h
@@ -10,6 +10,7 @@ Distributed under the LGPL
 
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <msp/time/timestamp.h>
 
@@ -41,8 +42,8 @@ protected:
        TargetList rdepends;
        bool deps_ready;
 
+       bool preparing;
        bool prepared;
-       bool counted;
 
        Target(Builder &, const Package *, const std::string &);
 public:
@@ -60,7 +61,7 @@ public:
        */
        Target *get_buildable_target();
 
-       bool get_buildable() const { return buildable; }
+       bool is_buildable() const { return buildable; }
        bool get_rebuild() const { return rebuild; }
        const std::string &get_rebuild_reason() const { return rebuild_reason; }
        void add_depend(Target *);
@@ -85,14 +86,6 @@ public:
        */
        Action *build();
 
-       void reset_count() { counted=false; }
-
-       /**
-       Returns the number of targets that need to be rebuilt in order to get this
-       target up-to-date.
-       */
-       virtual unsigned count_rebuild();
-
        /**
        Changes the mtime of the target to the current time.
        */
@@ -111,7 +104,7 @@ protected:
        virtual Action *create_action() =0;
 
        /**
-       Handles for the build_done signal of Action.
+       Handler for the build_done signal of Action.
        */
        virtual void build_done();
 };