Rearrange Target members

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index f5ca812169c3d4b4910289c4bf97a8d1962fd502..708293e7575da7e4ef67ca3e9fc0217f9ea7ab7a 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -123,7 +123,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 +152,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 +197,9 @@ void Component::create_targets() const
                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);
                }
@@ -210,7 +210,7 @@ void Component::create_targets() const
        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);
        }
 }
 
@@ -235,7 +235,7 @@ PathList Component::collect_source_files() const
 
 
 Component::Loader::Loader(Component &c):
-       comp(c)
+       DataFile::ObjectLoader<Component>(c)
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
@@ -247,22 +247,22 @@ Component::Loader::Loader(Component &c):
 
 void Component::Loader::source(const string &s)
 {
-       comp.sources.push_back(s);
+       obj.sources.push_back(s);
 }
 
 void Component::Loader::require(const string &n)
 {
-       Package *req = comp.pkg.get_builder().get_package_manager().find_package(n);
+       Package *req = obj.pkg.get_builder().get_package_manager().find_package(n);
        if(req)
-               comp.requires.push_back(req);
+               obj.requires.push_back(req);
 }
 
 void Component::Loader::build_info()
 {
-       load_sub(comp.build_info);
+       load_sub(obj.build_info);
 }
 
 void Component::Loader::install_map()
 {
-       load_sub(comp.install_map, comp.pkg.get_source());
+       load_sub(obj.install_map, obj.pkg.get_source());
 }