Code reorganizing and cleanup

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 890f123e2095855036e11655df664fec767ef293..eb46d9fe7116125798f4e7920baf71f5c87c8260 100644 (file)
--- a/source/target.h
+++ b/source/target.h
@@ -9,45 +9,51 @@ class Action;
 class Builder;
 class Package;
 
+class Target;
+typedef std::list<Target *> TargetList;
+
 class Target
 {
 public:
-       const std::string &get_name() const            { return name; }
-       Target            *get_buildable_target();
-       bool              get_rebuild() const          { return rebuild; }
-       const std::string &get_rebuild_reason() const  { return rebuild_reason; }
+       const std::string  &get_name() const           { return name; }
+       Target             *get_buildable_target();
+       bool               get_rebuild() const         { return rebuild; }
+       const std::string  &get_rebuild_reason() const { return rebuild_reason; }
        const Msp::Time::TimeStamp &get_mtime() const  { return mtime; }
        virtual const char *get_type() const=0;
-       const std::list<Target *> &get_depends() const { return depends; }
-       const Package     *get_package() const         { return package; }
-       bool              get_depends_ready() const       { return deps_ready; }
-       void              add_depend(Target *);
-       virtual void      find_depends()               { deps_ready=true; }
-       virtual void      prepare();
-       virtual Action    *build()=0;
-       void              reset_count()                { counted=false; }
-       virtual unsigned  count_rebuild();
-       void              touch();
+       const TargetList   &get_depends() const        { return depends; }
+       const Package      *get_package() const        { return package; }
+       bool               get_depends_ready() const   { return deps_ready; }
+       void               add_depend(Target *);
+       virtual void       find_depends()              { deps_ready=true; }
+       virtual void       prepare();
+       virtual Action     *build()=0;
+       void               reset_count()               { counted=false; }
+       virtual unsigned   count_rebuild();
+       void               touch();
        virtual ~Target() { }
 protected:
-       Builder     &builder;
+       Builder       &builder;
        const Package *package;
-       std::string name;
-       bool        building;
-       bool        rebuild;
-       std::string rebuild_reason;
+       std::string   name;
        Msp::Time::TimeStamp mtime;
-       std::list<Target *> depends;
-       std::list<Target *> rdepends;
-       bool        deps_ready;
-       bool        prepared;
-       bool        buildable;
-       bool        counted;
+
+       bool          buildable;
+       bool          building;
+       bool          rebuild;
+       std::string   rebuild_reason;
+
+       TargetList    depends;
+       TargetList    rdepends;
+       bool          deps_ready;
+
+       bool          prepared;
+       bool          counted;
 
        Target(Builder &, const Package *, const std::string &);
-       void mark_rebuild(const std::string &);
+       void         mark_rebuild(const std::string &);
        virtual void check_rebuild();
-       Action *build(Action *);
+       Action       *build(Action *);
        virtual void build_done();
 };