Adjust requires to library changes

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 385468210fc2590b433d6d426075dadc73a98224..6985db8cef39697864a60e74801f82e13f64c00f 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -27,8 +27,8 @@ public:
        bool     get_build_all() const { return build_all; }
        Package  *get_package(const std::string &);
        Target   *get_target(const std::string &);
-       Target   *get_header(const std::string &, const std::string &, const StringList &);
-       Target   *get_library(const std::string &, const StringList &, LibMode);
+       Target   *get_header(const std::string &, const std::string &, const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const std::string &, const StringList &, LibMode);
        const Msp::Path::Path &get_cwd() const { return cwd; }
        const std::string &get_arch_prefix(const std::string &) const;
        std::string get_tool(const std::string &, const std::string &);
@@ -45,7 +45,7 @@ private:
        private:
                Builder         &bld;
                Msp::Path::Path src;
-               
+
                void package(const std::string &);
        };
 
@@ -54,11 +54,11 @@ private:
        typedef std::map<std::string, Target *>    TargetMap;
        typedef std::map<std::string, StringMap>   ToolMap;
        typedef std::map<std::string, StringMap>   ProfileTemplateMap;
-       
+
        StringList   cmdline_targets;
        StringMap    cmdline_options;
        Msp::Path::Path cwd;
-       
+
        PackageMap   packages;
        PackageList  new_pkgs;
        Package      *default_pkg;
@@ -71,9 +71,10 @@ private:
        ToolMap      tools;    //< arch, tool name -> program name
        StringMap    archs;    //< arch -> prefix
        ProfileTemplateMap profile_tmpl;
-       
+
        Analyzer        *analyzer;
-       bool            do_build;
+       bool            build;
+       unsigned        clean;
        bool            dry_run;
        bool            help;
        unsigned        verbose;
@@ -84,16 +85,19 @@ private:
        bool            conf_all;
        bool            conf_only;
        bool            build_all;
+       bool            create_makefile;
 
        int    load_build_file(const Msp::Path::Path &);
        int    create_targets();
        Target *get_header(const Msp::Path::Path &);
-       Target *get_library(const std::string &, const Msp::Path::Path &, LibMode);
+       Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
        void   add_target(Target *);
        void   update_hash(std::string &, const std::string &);
-       int    build();
+       int    do_build();
+       int    do_clean();
+       int    do_create_makefile();
        void   package_help();
-       
+
        static Msp::Application::RegApp<Builder> reg;
 };