Hide the main package from the outside

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 23bd37417142235a7d13878f76f03a58a704d210..e9d9a700d202d0fcebab400c01df24ca6e5484e5 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -81,8 +81,6 @@ void Component::create_targets() const
 {
        Builder &builder = package.get_builder();
        const Toolchain &toolchain = builder.get_toolchain();
-       Target *world = builder.get_target("world");
-       Target *def_tgt = builder.get_target("default");
 
        PathList source_filenames = collect_source_files();
        list<Target *> inst_list;
@@ -149,10 +147,7 @@ void Component::create_targets() const
                        source = new File(builder, package, source_filenames.front());
                Target *result = dcomp.create_target(*source);
 
-               if(&package==builder.get_main_package() && deflt)
-                       def_tgt->add_dependency(*result);
-               else
-                       world->add_dependency(*result);
+               builder.add_primary_target(*result);
                if(install)
                        inst_list.push_back(result);
        }
@@ -194,10 +189,7 @@ void Component::create_targets() const
 
                for(list<Target *>::const_iterator i=results.begin(); i!=results.end(); ++i)
                {
-                       if(&package==builder.get_main_package() && deflt)
-                               def_tgt->add_dependency(**i);
-                       else
-                               world->add_dependency(**i);
+                       builder.add_primary_target(**i);
                        if(install)
                                inst_list.push_back(*i);
                }