X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=292f140a20cd97f79e101dfabb0cbc6dcd820ebd;hb=90bc57276bd8d82f4d95558ab7afc702edd4bdd2;hp=0d67fdeb874deaa60c1438f01764bbb1c697bf9c;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git

diff --git a/source/component.h b/source/component.h
index 0d67fde..292f140 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,17 +20,11 @@ their own.
 class Component
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Component>
 	{
-	private:
-		Component &comp;
-		std::string inst_hdr;
-
 	public:
 		Loader(Component &);
-		Component &get_object() { return comp; }
 	private:
-		virtual void finish();
 		void source(const std::string &);
 		void require(const std::string &);
 		void build_info();
@@ -39,7 +33,6 @@ public:
 
 	enum Type
 	{
-		HEADERS,
 		LIBRARY,
 		PROGRAM,
 		MODULE,
@@ -61,6 +54,7 @@ protected:
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
+
 	const SourcePackage &get_package() const { return pkg; }
 	Type get_type() const { return type; }
 	const std::string &get_name() const { return name; }
@@ -71,7 +65,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. */