X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.h;h=04c3c09a3648876578e8b7e7794e64bb3e9b6bd5;hb=16bda19cc87b5064daad9955f0ebb5ac5be7dec7;hp=891d75752396471978048d65cb7ffefc2f49cecf;hpb=172db6b81ecc2aa418729a6815b9134a685545fc;p=builder.git

diff --git a/source/target.h b/source/target.h
index 891d757..04c3c09 100644
--- a/source/target.h
+++ b/source/target.h
@@ -24,23 +24,27 @@ public:
 	typedef std::list<Target *> Dependencies;
 
 protected:
+	enum State
+	{
+		INIT,
+		PREPARING,
+		REBUILD,
+		BUILDING,
+		UPTODATE
+	};
+
 	Builder &builder;
 	const Package *package;
 	std::string name;
 
 	const Tool *tool;
-	bool buildable;
-	bool building;
-	bool rebuild;
+	State state;
 	std::string rebuild_reason;
 	std::string install_location;
 
 	Dependencies depends;
 	bool deps_ready;
 
-	bool preparing;
-	bool prepared;
-
 	Target(Builder &, const Package *, const std::string &);
 public:
 	virtual ~Target() { }
@@ -67,8 +71,8 @@ public:
 	void set_tool(const Tool &);
 	const Tool *get_tool() const { return tool; }
 
-	bool is_buildable() const { return buildable; }
-	bool get_rebuild() const { return rebuild; }
+	bool is_buildable() const { return tool!=0; }
+	bool needs_rebuild() const { return state>PREPARING && state<UPTODATE; }
 	const std::string &get_rebuild_reason() const { return rebuild_reason; }
 	bool is_installable() const { return !install_location.empty(); }
 	const std::string &get_install_location() const { return install_location; }