#include "executable.h"
#include "file.h"
#include "header.h"
-#include "install.h"
#include "objectfile.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
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();
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();
{
add("source", &Loader::source);
add("install", &Component::install);
- add("install_headers", &Loader::install_headers);
add("build_info", &Loader::build_info);
add("require", &Loader::require);
- add("modular", &Loader::modular);
- add("host", &Loader::host);
add("default", &Component::deflt);
}
comp.requires.push_back(req);
}
-void Component::Loader::modular()
-{
- IO::print("%s: Note: modular is deprecated\n", get_source());
- comp.build_info.ldflags.push_back("-rdynamic");
- comp.build_info.libs.push_back("dl");
-}
-
-void Component::Loader::host(const string &)
-{
- IO::print("%s: Note: host is deprecated\n", get_source());
-}
-
-void Component::Loader::install_headers(const string &p)
-{
- IO::print("%s: Note: install_headers is deprecated\n", get_source());
- if(comp.type==HEADERS)
- {
- comp.name = p;
- comp.install = true;
- }
- else
- inst_hdr = p;
-}
-
void Component::Loader::build_info()
{
load_sub(comp.build_info);