X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.h;h=f21fd31160c65b264bf17a7b74ca99341a1bac2b;hb=dcaf06c2bba4e02a312cd6af24ddc96410e7be4e;hp=962151c5e412f1923d873ec23504851f5ddd0d4e;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/objectfile.h b/source/objectfile.h
index 962151c..f21fd31 100644
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -1,24 +1,41 @@
 #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
 {
-public:
-	ObjectFile(Builder &, const Component &, SourceFile &);
-	const char *get_type() const { return "ObjectFile"; }
-	void find_depends();
-	Action *build();
 private:
 	const Component ∁
+	SourceFile &source;
+	Dependencies new_deps;
 	
-	void find_depends(Target *);
+public:
+	ObjectFile(Builder &, const Component &, SourceFile &);
+	virtual const char *get_type() const { return "ObjectFile"; }
+	const Component &get_component() const { return comp; }
+	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 *);
+
+	/** Adds a target to the dependency list as well as the new dependencies
+	list. */
+	void add_depend(Target *);
 
-	static std::string generate_target_name(const Component &, const std::string &);
+	static Msp::FS::Path generate_target_path(const Component &, const std::string &);
 };
 
 #endif