X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=4620cf475f51d3d99b5d251b274a760a92a4fb97;hb=b3b2a8666defb9e1a5937bcfefc1bc8e02793aab;hp=f8ef7451d6c59fed1bd6ac316cd407b86c5d3161;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/package.h b/source/package.h
index f8ef745..4620cf4 100644
--- a/source/package.h
+++ b/source/package.h
@@ -12,7 +12,6 @@ Distributed under the LGPL
 #include <string>
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "packageref.h"
 
 class Builder;
 class Package;
@@ -20,9 +19,9 @@ class Package;
 typedef std::list<Package *> PackageList;
 
 /**
-A package is a distributable piece of software.  They consist of one or more
-Components and may depend on other packages.  Packages also have configuration
-to determine where files are installed and which features to include.
+A package is a distributable piece of software.  Package information may be
+obtained in several ways: Build files of source packages, pkg-config for binary
+packages and the builderrc file for binary packages with no pkg-config support.
 */
 class Package
 {
@@ -40,13 +39,13 @@ public:
 
 	const std::string   &get_name() const           { return name; }
 	Builder             &get_builder() const        { return builder; }
-	const PkgRefList    &get_requires() const       { return requires; }
+	const PackageList   &get_requires() const       { return requires; }
+	PackageList         collect_requires();
 	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
 
 	/// Indicates whether or not this package supports pkg-config
 	bool get_use_pkgconfig() const { return use_pkgconfig; }
 
-	virtual void        resolve_refs();
 	void                configure(const StringMap &, unsigned);
 	virtual ~Package() { }
 protected:
@@ -54,7 +53,7 @@ protected:
 
 	std::string   name;
 
-	PkgRefList    requires;
+	PackageList   requires;
 	BuildInfo     export_binfo;
 	bool          conf_done;