X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=1eb93ceeee357a80501643d8d0053ae07edbaf8f;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=a7dfc34f7fff6091035e4c38cc2ec5c1fa150d45;hpb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index a7dfc34..1eb93ce 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -10,7 +10,6 @@ #include "executable.h" #include "file.h" #include "header.h" -#include "install.h" #include "objectfile.h" #include "sharedlibrary.h" #include "sourcepackage.h" @@ -50,7 +49,7 @@ void Component::create_build_info() for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end()) - build_info.add((*i)->get_exported_binfo()); + build_info.update_from((*i)->get_exported_binfo()); else { const BuildInfo &ebi = (*i)->get_exported_binfo(); @@ -65,7 +64,7 @@ void Component::create_build_info() all_reqs.push_back(*j); } - build_info.add(pkg.get_build_info()); + build_info.update_from(pkg.get_build_info()); for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) *i = (pkg.get_source() / *i).str();