X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomponent.h;h=561a25091381bb4eb5838d1aa0b34b4f9fb89793;hb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;hp=5efed1a08ad06bd1ef4db470b3c263f4f4d53f09;hpb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;p=builder.git

diff --git a/source/component.h b/source/component.h
index 5efed1a..561a250 100644
--- a/source/component.h
+++ b/source/component.h
@@ -2,7 +2,7 @@
 #define COMPONENT_H_
 
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "installmap.h"
@@ -20,14 +20,10 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
-	private:
-		Component &comp;
-
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
 		void source(const std::string &);
 		void require(const std::string &);
@@ -37,7 +33,6 @@ public:
 
 	enum Type
 	{
-		HEADERS,
 		LIBRARY,
 		PROGRAM,
 		MODULE,
@@ -69,7 +64,7 @@ public:
 	bool is_default() const { return deflt; }
 	const InstallMap &get_install_map() const { return install_map; }
 
-	void configure(const StringMap &, unsigned);
+	void prepare();
 
 	/** Prepares the build information for building.  Pulls build info from the
 	parent and dependency packages, and adds any component-specific flags. */