X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.h;h=af47c66863088ae2448f718e932338d42957ca99;hb=4facd021514ab372c23b1b132d6b4b62baa4efbf;hp=8306aea46284ac63d668dc73ebc4dfd62274f0d3;hpb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;p=builder.git

diff --git a/source/objectfile.h b/source/objectfile.h
index 8306aea..af47c66 100644
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -1,27 +1,36 @@
 #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:
+	const Component ∁
+	SourceFile &source;
+	
 public:
 	ObjectFile(Builder &, const Component &, SourceFile &);
-	const char      *get_type() const { return "ObjectFile"; }
+	virtual const char *get_type() const { return "ObjectFile"; }
 	const Component &get_component() const { return comp; }
-	void            find_depends();
-	Action          *build();
+	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:
-	const Component ∁
-	TargetList      new_deps;
-	
-	void find_depends(Target *);
-	void add_depend(Target *);
+	/** Recursively looks for header targets and adds them as dependencies. */
+	void find_depends(FileTarget *);
 
-	static std::string generate_target_name(const Component &, const std::string &);
+	static Msp::FS::Path generate_target_path(const Component &, const std::string &);
 };
 
 #endif