Rework the Target class hierarchy

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 25713e17f8acc26a21566fafef22e4de4c8d9e14..b165bad72550900f75c9e82400a86dd91f0816d7 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -21,10 +21,10 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-Link::Link(Builder &b, const Executable &exe):
+Link::Link(Builder &b, const Binary &bin):
        ExternalAction(b)
 {
-       const Component &comp=exe.get_component();
+       const Component &comp=bin.get_component();
 
        work_dir=comp.get_package().get_source();
 
@@ -44,29 +44,27 @@ Link::Link(Builder &b, const Executable &exe):
                argv.push_back("-L"+*i);
 
        argv.push_back("-o");
-       argv.push_back(relative(exe.get_name(), work_dir).str());
-       const TargetList &deps=exe.get_depends();
+       argv.push_back(relative(bin.get_path(), work_dir).str());
+       const TargetList &deps=bin.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
                Target *tgt=*i;
-               if(dynamic_cast<Install *>(tgt))
-                       tgt=tgt->get_depends().front();
+               if(Install *inst=dynamic_cast<Install *>(tgt))
+                       tgt=&inst->get_source();
 
-               if(dynamic_cast<ObjectFile *>(tgt))
-                       argv.push_back(relative((*i)->get_name(), work_dir).str());
-               else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
-                       argv.push_back("-l"+shlib->get_libname());
-               else if(dynamic_cast<StaticLibrary *>(tgt))
-                       argv.push_back((*i)->get_name());
-               else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
-                       argv.push_back("-l"+syslib->get_libname());
+               if(ObjectFile *obj=dynamic_cast<ObjectFile *>(tgt))
+                       argv.push_back(relative(obj->get_path(), work_dir).str());
+               else if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(tgt))
+                       argv.push_back(stlib->get_path().str());
+               else if(Library *lib=dynamic_cast<Library *>(tgt))
+                       argv.push_back("-l"+lib->get_libname());
        }
 
-       FS::Path epath=exe.get_name();
+       FS::Path binpath=bin.get_path();
        if(!builder.get_dry_run())
-               FS::mkpath(FS::dirname(epath), 0755);
+               FS::mkpath(FS::dirname(binpath), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
+       announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str());
 
        launch();
 }