Check headers as well

[builder.git] / source / installedfile.cpp

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index a71bcba3c29adae803f357c1455ad3dc76bae2d5..4638cc40d6cec73cdb4b9af420c3d947da385523 100644 (file)
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,3 +1,4 @@
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "installedfile.h"
@@ -10,7 +11,7 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
        FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
        source(s)
 {
-       add_depend(&source);
+       add_dependency(source);
 
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
                if(!shlib->get_soname().empty())
@@ -28,10 +29,17 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
        FS::Path mid;
        if(!loc.empty())
                mid = loc;
+       else if(const Component *comp = tgt.get_component())
+               mid = comp->get_install_map().get_install_location(tgt);
        else
                mid = tgt.get_install_location();
 
-       return prefix/mid/FS::basename(tgt.get_path());
+       string fn = FS::basename(tgt.get_path());
+       if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&tgt))
+               if(!shlib->get_soname().empty())
+                       fn = shlib->get_soname();
+
+       return prefix/mid/fn;
 }
 
 Target *InstalledFile::get_real_target()
@@ -47,4 +55,13 @@ void InstalledFile::check_rebuild()
                mark_rebuild(source.get_name()+" has changed");
        else if(source.needs_rebuild())
                mark_rebuild(source.get_name()+" needs rebuilding");
+       else if(!link.empty() && !FS::exists(link))
+               mark_rebuild("Symlink does not exist");
+}
+
+void InstalledFile::clean()
+{
+       if(!link.empty() && mtime)
+               FS::unlink(link);
+       FileTarget::clean();
 }