X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=b3e096848f5de0db856a644450f2482ca90e20bc;hb=afd944a9a8b9d727326cdc4d3b7122384a8d9b5d;hp=9dfa2e693fdeb8ff27afcb0cd7383f381b3da1ec;hpb=b5ccba555f4985233532041c34e28d71dd58933f;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 9dfa2e6..b3e0968 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -24,7 +24,7 @@ #include "installedfile.h" #include "misc.h" #include "package.h" -#include "pkgconfig.h" +#include "pkgconfigfile.h" #include "pkgconfiggenerator.h" #include "sharedlibrary.h" #include "sourcepackage.h" @@ -504,8 +504,8 @@ int Builder::create_targets() if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE)) { - PkgConfig *pc = new PkgConfig(*this, *spkg); - install->add_depend(new InstalledFile(*this, *spkg, *pc)); + PkgConfigFile *pc = new PkgConfigFile(*this, *spkg); + install->add_depend(toolchain.get_tool("CP").create_target(*pc)); } } @@ -585,8 +585,18 @@ int Builder::do_build() Task *task = tgt->build(); if(task) { - task->start(); - tasks.push_back(task); + if(verbose>=2) + IO::print("%s\n", task->get_command()); + if(dry_run) + { + task->signal_finished.emit(true); + delete task; + } + else + { + task->start(); + tasks.push_back(task); + } } if(show_progress)