Process ObjectFile dependencies correctly even when it's processed before some header...

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 21135b03970aa96a7b0641e096b4cba6b513860a..ab9134aff85c2b4e34ab4c9eacd719c4e8ccc06d 100644 (file)
--- a/source/target.h
+++ b/source/target.h
@@ -5,31 +5,29 @@
 #include <string>
 #include <msp/time/timestamp.h>
 
+class Action;
 class Builder;
 class Package;
-class Target;
-
-class TargetRef
-{
-public:
-       TargetRef(Builder &b, const std::string &n): builder(b), name(n) { }
-       Target *get_target();
-private:
-       Builder &builder;
-       std::string name;
-       Target *target;
-};
 
 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; }
-       virtual void find_depends()=0;
-       void   add_depend(Target *);
+       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; }
+       unsigned          count_rebuild();
+       void              touch();
        virtual ~Target() { }
 protected:
        Builder     &builder;
@@ -41,10 +39,16 @@ protected:
        Msp::Time::TimeStamp mtime;
        std::list<Target *> depends;
        std::list<Target *> rdepends;
-       bool        ready_for_build;
+       bool        deps_ready;
+       bool        prepared;
+       bool        buildable;
+       bool        counted;
 
        Target(Builder &, const Package *, const std::string &);
        void mark_rebuild(const std::string &);
+       virtual void check_rebuild();
+       Action *build(Action *);
+       virtual void build_done();
 };
 
 #endif