for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
*i = (pkg.get_source() / *i).str();
- if(pkg.get_library_mode()!=DYNAMIC)
+ if(type==LIBRARY || type==MODULE)
+ if(build_info.libmode<BuildInfo::DYNAMIC)
+ build_info.libmode = BuildInfo::DYNAMIC;
+
+ if(build_info.libmode<BuildInfo::DYNAMIC)
{
for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
}
}
-
- if(type==PROGRAM)
- build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
}
void Component::create_targets() const
/*Target *result = tar.create_target(files, tarname);
Target *tarballs_tgt = builder.get_target("tarballs");
- tarballs_tgt->add_depend(result);*/
+ tarballs_tgt->add_depend(*result);*/
return;
}
Target *result = dcomp.create_target(*source);
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(result);
+ def_tgt->add_depend(*result);
else
- world->add_depend(result);
+ world->add_depend(*result);
if(install)
inst_list.push_back(result);
}
for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
{
if(&pkg==builder.get_main_package() && deflt)
- def_tgt->add_depend(*i);
+ def_tgt->add_depend(**i);
else
- world->add_depend(*i);
+ world->add_depend(**i);
if(install)
inst_list.push_back(*i);
}
for(list<Target *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
{
Target *inst = copy.create_target(**i, inst_loc);
- inst_tgt->add_depend(inst);
+ inst_tgt->add_depend(*inst);
}
}
FS::Path path(*i);
if(FS::is_dir(path))
{
+ pkg.get_builder().get_logger().log("files", format("Traversing %s", path));
list<string> sfiles = list_files(path);
for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
files.push_back(path / *j);