X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=97c8d61a6fb7914494c31475a8423e8954d3d66c;hb=0dea0d850f6690de07933794592916d11c9d3f49;hp=bdcba478262a786d5e3a91369787ec2b00632bb7;hpb=5b7f561504df231c23ecd9b6f3b3847cfe0cbd1f;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index bdcba47..97c8d61 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -28,7 +28,7 @@ A package that can be built by Builder.
 class SourcePackage: public Package
 {
 public:
-	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package>
+	class Loader: public Msp::DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>
 	{
 	private:
 		const Config::InputOptions *options;
@@ -46,7 +46,6 @@ public:
 		void condition(const std::string &);
 		void build_info();
 		void headers(const std::string &);
-		void if_arch(const std::string &);
 		void if_feature(const std::string &);
 		void source_tarball();
 		void tarball(const std::string &);
@@ -56,6 +55,8 @@ public:
 	typedef std::list<Component> ComponentList;
 
 private:
+	typedef std::list<Feature> FeatureList;
+
 	std::string version;
 	std::string description;
 
@@ -86,9 +87,7 @@ public:
 
 	Cache &get_cache() const { return cache; }
 private:
-	virtual void create_build_info();
-
-	virtual void create_targets();
+	virtual void do_prepare();
 
 	virtual void save_caches();
 };