X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=4638cc40d6cec73cdb4b9af420c3d947da385523;hb=1c43971ed99fd2f72ae171d6cdafabab74e37f4e;hp=15bd08b06f7b507b16109c8f08f7933306d1e092;hpb=e0c863681c8a5fad5918bb7730ecbc65fbdfbc64;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 15bd08b..4638cc4 100644
--- 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())
@@ -33,7 +34,12 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	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()
@@ -49,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();
 }