Rearrange Target members

[builder.git] / source / objectfile.h

diff --git a/source/objectfile.h b/source/objectfile.h
index 962151c5e412f1923d873ec23504851f5ddd0d4e..2e9b6e1a4333074e71c18fe1502ab49661a68c13 100644 (file)
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -1,24 +1,35 @@
 #ifndef OBJECTFILE_H_
 #define OBJECTFILE_H_
 
-#include "target.h"
+#include "filetarget.h"
 
-class Component;
 class SourceFile;
 
-class ObjectFile: public Target
+/**
+Object files are compiled from source files.
+*/
+class ObjectFile: public FileTarget
 {
+private:
+       SourceFile &source;
+       
 public:
        ObjectFile(Builder &, const Component &, SourceFile &);
-       const char *get_type() const { return "ObjectFile"; }
-       void find_depends();
-       Action *build();
 private:
-       const Component ∁
-       
-       void find_depends(Target *);
+       static Msp::FS::Path generate_target_path(const Component &, const std::string &);
 
-       static std::string generate_target_name(const Component &, const std::string &);
+public:
+       virtual const char *get_type() const { return "ObjectFile"; }
+       SourceFile &get_source() const { return source; }
+
+       /** Processes as many new dependences as possible.  Some may be created on
+       the fly and can't be processed until their own dependencies are ready.  In
+       such cases this function needs to be called again. */
+       virtual void find_depends();
+
+private:
+       /** Recursively looks for header targets and adds them as dependencies. */
+       void find_depends(FileTarget *);
 };
 
 #endif