X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=3c8749ecb3459defeff2e7fa734d5a8f3e8faebd;hb=30b1243ff16b908ae18b4ab9d70f772c9196b949;hp=0bfc2fc4da119e614c9017e7b6093fc82c60a457;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 0bfc2fc..3c8749e 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -74,9 +74,6 @@ void Component::create_build_info() build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); } } - - if(type==PROGRAM) - build_info.strip = lexical_cast(pkg.get_config().get_option("strip").value); } void Component::create_targets() const @@ -123,7 +120,7 @@ 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; } @@ -152,9 +149,9 @@ void Component::create_targets() const 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); } @@ -197,9 +194,9 @@ void Component::create_targets() const for(list::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); } @@ -210,7 +207,7 @@ void Component::create_targets() const for(list::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); } }