X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=f47f25931489928c0f98524a62b85f37cd867f72;hb=54aab19ee471810a956e1fee4d3b962aaf9ae9b3;hp=f4a8e242adb69bb1f63b2caec1b736d822a8fdb3;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index f4a8e24..f47f259 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -16,7 +16,6 @@ Distributed under the LGPL
 #include "dependencycache.h"
 #include "feature.h"
 #include "package.h"
-#include "packageref.h"
 
 class Builder;
 
@@ -51,15 +50,15 @@ public:
 		void tar_file(const std::string &);
 	};
 
-	SourcePackage(Builder &, const std::string &, const Msp::Path::Path &);
-	void                set_path(const Msp::Path::Path &);
+	SourcePackage(Builder &, const std::string &, const Msp::Path &);
+	void                set_path(const Msp::Path &);
 	const std::string   &get_name() const           { return name; }
 	const std::string   &get_version() const        { return version; }
 	const std::string   &get_description() const    { return description; }
-	const Msp::Path::Path &get_source() const       { return source; }
-	Msp::Path::Path     get_temp_dir() const;
-	Msp::Path::Path     get_out_dir() const;
-	Msp::Path::Path     get_prefix() const          { return config.get_option("prefix").value; }
+	const Msp::Path &get_source() const       { return source; }
+	Msp::Path     get_temp_dir() const;
+	Msp::Path     get_out_dir() const;
+	Msp::Path     get_prefix() const          { return config.get_option("prefix").value; }
 	const ComponentList &get_components() const     { return components; }
 	const Config        &get_config() const         { return config; }
 	const BuildInfo     &get_build_info() const     { return build_info; }
@@ -70,13 +69,12 @@ public:
 	LibMode             get_library_mode() const;
 	const PathList      &get_tar_files() const      { return tar_files; }
 	DependencyCache     &get_deps_cache() const     { return deps_cache; }
-	virtual void        resolve_refs();
 private:
 	std::string   version;
 	std::string   description;
 
-	Msp::Path::Path source;
-	PackageList   all_reqs;
+	Msp::Path source;
+	PackageList   base_reqs;
 	FeatureList   features;
 	BuildInfo     build_info;
 	ConditionList conditions;