X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=7ec986e1c2c2d4395d76c8e20d78a2d91235538d;hb=1ff899633e05aa28392c0352ab2d9239d017159e;hp=f74b4a09bdda43e905df82ff8584009b2da0b9db;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index f74b4a0..7ec986e 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -11,30 +11,23 @@ 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;
 
-	builder.get_logger().log("configure", format("Configuring %s", 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;
 }