Make BuildInfo able to handle chained dependencies

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index bb1efe41df6f055184dff6d2147dbec3eba3067a..7db9880c051b52633310b4bddfacf04b867283c7 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -48,15 +48,10 @@ void Component::create_build_info()
        PackageList all_reqs = direct_reqs;
        for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
+               BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
                if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
-                       build_info.update_from((*i)->get_exported_binfo());
-               else
-               {
-                       const BuildInfo &ebi = (*i)->get_exported_binfo();
-                       build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
-                       build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
-                       build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end());
-               }
+                       level = BuildInfo::DEPENDENCY;
+               build_info.update_from((*i)->get_exported_binfo(), level);
 
                const PackageList &reqs = (*i)->get_requires();
                for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)