Trim down the package preparation code

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 14b343d9687227599a865130fa6fbe28dbe596cf..e98f4e786f88b9d2fd4e674f1dcf76249e4965ee 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "config.h"
 
 class Builder;
 class Package;
@@ -34,7 +35,7 @@ protected:
 
        PackageList requires;
        BuildInfo export_binfo;
-       bool conf_done;
+       bool prepared;
 
        bool use_pkgconfig;
 
@@ -51,18 +52,17 @@ public:
        /// Indicates whether or not this package supports pkg-config
        bool get_use_pkgconfig() const { return use_pkgconfig; }
 
-       /** Processes configuration options that were most likely obtained from the
-       command line. */
-       void configure(const StringMap &, unsigned);
+       /** Prepares the package for building.  Recursively prepares all required
+       packages, populates build info and creates targets. */
+       void prepare();
 
-       bool is_configured() const { return conf_done; }
+       bool is_prepared() const { return prepared; }
 protected:
-       virtual void do_configure(const StringMap &, unsigned) { }
        virtual void create_build_info() { }
 
-public:
        virtual void create_targets() { }
 
+public:
        virtual void save_caches() { }
 };