Remove a useless path-to-string conversion

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index a5076fb3a71d75fefdc1f88f6ea88a0e71688b20..c12399f670f944e2a22f953862f3763ba05ff795 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -15,7 +15,6 @@
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
-#include "symlink.h"
 #include "tarball.h"
 #include "target.h"
 
@@ -123,7 +122,7 @@ void Component::create_targets() const
                for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
                        FileTarget *ft;
-                       if(Target *tgt = builder.get_target(i->str()))
+                       if(Target *tgt = builder.get_target_by_path(*i))
                                ft = dynamic_cast<FileTarget *>(tgt);
                        else
                                ft = new File(builder, *i);
@@ -141,7 +140,7 @@ void Component::create_targets() const
                for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i)
                {
                        FileTarget *ft;
-                       if(Target *tgt = builder.get_target(i->str()))
+                       if(Target *tgt = builder.get_target_by_path(*i))
                                ft = dynamic_cast<FileTarget *>(tgt);
                        else
                                ft = new File(builder, pkg, *i);
@@ -151,7 +150,7 @@ void Component::create_targets() const
        else if(type==DATAFILE)
        {
                File *source;
-               if(Target *tgt = builder.get_target(files.front().str()))
+               if(Target *tgt = builder.get_target_by_path(files.front()))
                        source = dynamic_cast<File *>(tgt);
                else
                        source = new File(builder, pkg, files.front());
@@ -171,7 +170,7 @@ void Component::create_targets() const
                        string ext = FS::extpart(FS::basename(*i));
                        if(ext==".h")
                        {
-                               FileTarget *hdr = dynamic_cast<FileTarget *>(builder.get_target(i->str()));
+                               FileTarget *hdr = builder.get_target_by_path(*i);
                                if(!hdr)
                                        hdr = new Header(builder, *this, i->str());
 
@@ -221,11 +220,6 @@ void Component::create_targets() const
        {
                Install *inst = new Install(builder, pkg, **i, inst_loc);
                inst_tgt->add_depend(inst);
-
-               if(type==LIBRARY)
-                       if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(*i))
-                               if(!shlib->get_soname().empty())
-                                       inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name()));
        }
 }