X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.h;h=f21fd31160c65b264bf17a7b74ca99341a1bac2b;hb=dc4b917034c9d3718f07139e2f0f3631a080c6f3;hp=dbb49fe02c8355d3f43f9eaa24f3ce0016a25851;hpb=be8a901dfc026f61db46d5d64a41cecc619bc97d;p=builder.git

diff --git a/source/objectfile.h b/source/objectfile.h
index dbb49fe..f21fd31 100644
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef OBJECTFILE_H_
 #define OBJECTFILE_H_
 
-#include "target.h"
+#include "filetarget.h"
 
 class Component;
 class SourceFile;
@@ -16,22 +9,33 @@ class SourceFile;
 /**
 Object files are compiled from source files.
 */
-class ObjectFile: public Target
+class ObjectFile: public FileTarget
 {
+private:
+	const Component ∁
+	SourceFile &source;
+	Dependencies new_deps;
+	
 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();
+	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 *);
+	/** 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 *);
-	virtual Action  *create_action();
 
-	static std::string generate_target_name(const Component &, const std::string &);
+	static Msp::FS::Path generate_target_path(const Component &, const std::string &);
 };
 
 #endif