X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=8a05ddc89699950dd5d59ce2977741b4f4be47ad;hb=8b9f2196ec0a930992614f174b7970c2ed523699;hp=f1374298eac0c8d14315a03d751498d5ba144a97;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index f137429..8a05ddc 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
@@ -20,22 +13,8 @@ Package::Package(Builder &b, const string &n):
 	name(n),
 	conf_done(false),
 	use_pkgconfig(true)
-{ }
-
-PackageList Package::collect_requires()
 {
-	PackageList result;
-	result.push_back(this);
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-	{
-		PackageList r = (*i)->collect_requires();
-		result.splice(result.end(), r);
-	}
-
-	result.sort();
-	result.unique();
-
-	return result;
+	builder.get_package_manager().add_package(this);
 }
 
 void Package::configure(const StringMap &opts, unsigned flag)
@@ -68,7 +47,7 @@ Package::Loader::Loader(Package &p):
 
 void Package::Loader::require(const string &n)
 {
-	Package *req = pkg.builder.get_package(n);
+	Package *req = pkg.builder.get_package_manager().find_package(n);
 	if(req)
 		pkg.requires.push_back(req);
 }