X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.h;h=f21fd31160c65b264bf17a7b74ca99341a1bac2b;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=4845a0f15c0ca3490e619fa618766533e7852f43;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/objectfile.h b/source/objectfile.h
index 4845a0f..f21fd31 100644
--- a/source/objectfile.h
+++ b/source/objectfile.h
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  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,16 +9,18 @@ class SourceFile;
 /**
 Object files are compiled from source files.
 */
-class ObjectFile: public Target
+class ObjectFile: public FileTarget
 {
 private:
 	const Component ∁
-	TargetList new_deps;
+	SourceFile &source;
+	Dependencies new_deps;
 	
 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
@@ -34,14 +29,13 @@ public:
 
 private:
 	/** Recursively looks for header targets and adds them as dependencies. */
-	void find_depends(Target *);
+	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