Trim down the package preparation code

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 38829f758c76af4f44cde0ec1a88565b42238a22..7ec986e1c2c2d4395d76c8e20d78a2d91235538d 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -11,42 +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;
 
-       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;
 }
 
 
 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_manager().find_package(n);
+       Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
-               pkg.requires.push_back(req);
+               obj.requires.push_back(req);
 }