Change conf_all into a normal commandline option

diff --git a/source/builder.cpp b/source/builder.cpp
index 1917cd42288223796c123ae23797a04734b5e6e4..bab8eb0af8701deb9a8f68e07491ca4eeed6fc2e 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -47,6 +47,7 @@ Builder::Builder(int argc, char **argv):
        getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build"));
        getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
        getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
+       getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
        int index=getopt(argc, argv);
 
        verbose+=getopt['v'].count();
@@ -81,6 +82,8 @@ Builder::Builder(int argc, char **argv):
 
        chrome=getopt["chrome"];
 
+       conf_all=getopt['A'];
+
        if(getopt['C'])
                chdir(getopt['C'].arg().c_str());
 
@@ -234,7 +237,6 @@ int Builder::main()
 
        default_pkg=packages.begin()->second;
 
-       bool conf_all=cmdline_options.count("conf_all");
        while(!new_pkgs.empty())
        {
                Package *pkg=new_pkgs.front();

diff --git a/source/builder.h b/source/builder.h
index cff7c4e20aeb25439746f9bea8eed94fc9d96fc0..400be8a5de392fb0d37ad54db5e55b7db9650001 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -63,6 +63,7 @@ private:
        unsigned    jobs;
        std::list<std::string> what_if;
        bool        chrome;
+       bool        conf_all;
 
        int load_build_file(const Msp::Path::Path &);
        int create_targets();