X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.h;h=bb2c41322c7dbd6185257159a1f7fff03ada4461;hb=e71eaecb9a31304fe5e096ea29660ea25c1bfa9f;hp=aafec0fc54cd2c58d0b63ef2f4758ab647f8ccdf;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/package.h b/source/package.h
index aafec0f..bb2c413 100644
--- a/source/package.h
+++ b/source/package.h
@@ -7,22 +7,9 @@
 #include "buildinfo.h"
 #include "component.h"
 #include "config.h"
+#include "packageref.h"
 
 class Builder;
-class Package;
-
-class PackageRef
-{
-public:
-	PackageRef(Builder &, const std::string &);
-	const std::string &get_name() const { return name; }
-	Package *get_package() const { return package; }
-	Package *resolve();
-private:
-	Builder     &builder;
-	std::string name;
-	Package     *package;
-};
 
 class Package
 {
@@ -39,6 +26,8 @@ public:
 		void require(const std::string &);
 		void program(const std::string &);
 		void library(const std::string &);
+		void headers(const std::string &);
+		void build_info();
 	};
 
 	Package(Builder &, const std::string &, const Msp::Path::Path &);
@@ -51,6 +40,7 @@ public:
 	const std::list<PackageRef> &get_requires() const { return requires; }
 	const BuildInfo     &get_build_info() const { return build_info; }
 	const BuildInfo     &get_exported_binfo() const { return export_binfo; }
+	Builder             &get_builder() const    { return builder; }
 	void                resolve_refs();
 	void                create_build_info();
 	void                process_options(const RawOptionMap &);