X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=7ec986e1c2c2d4395d76c8e20d78a2d91235538d;hb=64f01c486e48f260a5d895092806ee341ef23198;hp=c4710bca79a4f6082b7dd3e7b62297e85a247599;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index c4710bc..7ec986e 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -11,41 +11,35 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
 	builder(b),
 	name(n),
-	conf_done(false),
+	prepared(false),
 	use_pkgconfig(true)
-{ }
+{
+	builder.get_package_manager().add_package(this);
+}
 
-void Package::configure(const StringMap &opts, unsigned flag)
+void Package::prepare()
 {
-	if(conf_done)
+	if(prepared)
 		return;
 
-	if(builder.get_verbose()>=3)
-		IO::print("Configuring %s\n", name);
-
-	do_configure(opts, flag);
-
-	requires.sort();
-	requires.unique();
-
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
+	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+		(*i)->prepare();
 
 	create_build_info();
-
-	conf_done = true;
+	create_targets();
+	prepared = true;
 }
 
 
 Package::Loader::Loader(Package &p):
-	pkg(p)
+	DataFile::ObjectLoader<Package>(p)
 {
 	add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
-	Package *req = pkg.builder.get_package(n);
+	Package *req = obj.builder.get_package_manager().find_package(n);
 	if(req)
-		pkg.requires.push_back(req);
+		obj.requires.push_back(req);
 }