Target *def_tgt=builder.get_target("default");
PathList files=collect_source_files();
+ list<FileTarget *> inst_list;
+ string inst_loc;
if(type==TARBALL)
{
string tarname=name;
return;
}
-
- list<FileTarget *> inst_list;
- for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+ else if(type==INSTALL)
{
- string ext=FS::extpart(FS::basename(*i));
- if(ext==".h")
+ inst_loc=name;
+ for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
{
- FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
- if(!hdr)
- hdr=new Header(builder, this, i->str());
+ FileTarget *ft;
+ if(Target *tgt=builder.get_target(i->str()))
+ ft=dynamic_cast<FileTarget *>(tgt);
+ else
+ ft=new File(builder, pkg, *i);
+ inst_list.push_back(ft);
+ }
+ }
+ else
+ {
+ for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
+ {
+ string ext=FS::extpart(FS::basename(*i));
+ if(ext==".h")
+ {
+ FileTarget *hdr=dynamic_cast<FileTarget *>(builder.get_target(i->str()));
+ if(!hdr)
+ hdr=new Header(builder, *this, i->str());
- // Install headers if requested
- if(type==HEADERS && install)
- inst_list.push_back(hdr);
+ // Install headers if requested
+ if(type==HEADERS && install)
+ inst_list.push_back(hdr);
+ }
}
}
string ext=FS::extpart(FS::basename(*i));
if((ext==".cpp" || ext==".cc" || ext==".c"))
{
- SourceFile *src=new SourceFile(builder, this, i->str());
+ SourceFile *src=new SourceFile(builder, *this, i->str());
ObjectFile *obj=new ObjectFile(builder, *this, *src);
objs.push_back(obj);
}
Target *inst_tgt=builder.get_target("install");
for(list<FileTarget *>::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i)
- inst_tgt->add_depend(new Install(builder, pkg, **i));
+ inst_tgt->add_depend(new Install(builder, pkg, **i, inst_loc));
}
PathList Component::collect_source_files() const