1 files changed, 19 insertions, 51 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 0007ddf447..42f665b0e6 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -26,22 +26,14 @@
 ****************************************************************************/
 
 #include "autotoolsbuildconfiguration.h"
-#include "makestep.h"
-#include "autotoolsproject.h"
+
 #include "autotoolsprojectconstants.h"
-#include "autogenstep.h"
-#include "autoreconfstep.h"
-#include "configurestep.h"
 
-#include <coreplugin/icore.h>
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
-#include <utils/mimetypes/mimedatabase.h>
-#include <utils/qtcassert.h>
 
 using namespace AutotoolsProjectManager::Constants;
 using namespace ProjectExplorer;
@@ -63,37 +55,29 @@ AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, Core::I
     setConfigWidgetDisplayName(tr("Autotools Manager"));
 }
 
-void AutotoolsBuildConfiguration::initialize(const BuildInfo &info)
+void AutotoolsBuildConfiguration::initialize()
 {
-    BuildConfiguration::initialize(info);
+    BuildConfiguration::initialize();
 
     BuildStepList *buildSteps = stepList(BUILDSTEPS_BUILD);
 
     // ### Build Steps Build ###
     // autogen.sh or autoreconf
     QFile autogenFile(target()->project()->projectDirectory().toString() + "/autogen.sh");
-    if (autogenFile.exists()) {
-        auto autogenStep = new AutogenStep(buildSteps);
-        buildSteps->appendStep(autogenStep);
-    } else {
-        auto autoreconfStep = new AutoreconfStep(buildSteps);
-        buildSteps->appendStep(autoreconfStep);
-    }
+    if (autogenFile.exists())
+        buildSteps->appendStep(Constants::AUTOGEN_STEP_ID);
+    else
+        buildSteps->appendStep(Constants::AUTORECONF_STEP_ID);
 
     // ./configure.
-    auto configureStep = new ConfigureStep(buildSteps);
-    buildSteps->appendStep(configureStep);
-    connect(this, &BuildConfiguration::buildDirectoryChanged,
-            configureStep, &ConfigureStep::notifyBuildDirectoryChanged);
+    buildSteps->appendStep(Constants::CONFIGURE_STEP_ID);
 
     // make
-    auto makeStep = new MakeStep(buildSteps);
-    buildSteps->appendStep(makeStep);
+    buildSteps->appendStep(Constants::MAKE_STEP_ID);
 
     // ### Build Steps Clean ###
     BuildStepList *cleanSteps = stepList(BUILDSTEPS_CLEAN);
-    auto cleanMakeStep = new MakeStep(cleanSteps);
-    cleanSteps->appendStep(cleanMakeStep);
+    cleanSteps->appendStep(Constants::MAKE_STEP_ID);
 }
 
 
@@ -108,34 +92,18 @@ AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory()
     setSupportedProjectMimeTypeName(Constants::MAKEFILE_MIMETYPE);
 }
 
-QList<BuildInfo> AutotoolsBuildConfigurationFactory::availableBuilds(const Target *parent) const
-{
-    return {createBuildInfo(parent->kit(), parent->project()->projectDirectory())};
-}
-
-QList<BuildInfo> AutotoolsBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
-{
-    const QString path = QFileInfo(projectPath).absolutePath();
-    BuildInfo info = createBuildInfo(k, Utils::FilePath::fromString(path));
-    //: The name of the build configuration created by default for a autotools project.
-    info.displayName = tr("Default");
-    return {info};
-}
-
-BuildInfo AutotoolsBuildConfigurationFactory::createBuildInfo(const Kit *k,
-                                                              const Utils::FilePath &buildDir) const
+QList<BuildInfo> AutotoolsBuildConfigurationFactory::availableBuilds
+    (const Kit *k, const FilePath &projectPath, bool forSetup) const
 {
     BuildInfo info(this);
     info.typeName = tr("Build");
-    info.buildDirectory = buildDir;
+    info.buildDirectory = forSetup ? FilePath::fromString(projectPath.toFileInfo().absolutePath()) : projectPath;
     info.kitId = k->id();
-    return info;
-}
-
-BuildConfiguration::BuildType AutotoolsBuildConfiguration::buildType() const
-{
-    // TODO: Should I return something different from Unknown?
-    return Unknown;
+    if (forSetup) {
+        //: The name of the build configuration created by default for a autotools project.
+        info.displayName = tr("Default");
+    }
+    return {info};
 }
 
 } // Internal