X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=4ee821fab1ab55bc74a5075a378f2b926e89b990;hb=20be24789dbfb2acd3f8d2076a6b19ff6a2451ee;hp=24ba6e1ddc4e5af3e63ce1ab1bd0f211e46c4f01;hpb=f8961a9113477735724a3a5229b9338bc9c0fe2e;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 24ba6e1..4ee821f 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,18 +1,12 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
-#include "copy.h"
-#include "executable.h"
-#include "datafile.h"
 #include "installedfile.h"
-#include "package.h"
-#include "pkgconfig.h"
 #include "sharedlibrary.h"
-#include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
-InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const std::string &loc):
+InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s, const string &loc):
 	FileTarget(b, &p, generate_target_path(b.get_prefix(), s, loc)),
 	source(s)
 {
@@ -37,11 +31,11 @@ void InstalledFile::check_rebuild()
 		mark_rebuild("Does not exist");
 	else if(source.get_mtime()>mtime || source.get_size()!=size)
 		mark_rebuild(source.get_name()+" has changed");
-	else if(source.get_rebuild())
+	else if(source.needs_rebuild())
 		mark_rebuild(source.get_name()+" needs rebuilding");
 }
 
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const std::string &loc)
+FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
 {
 	if(!tgt.is_installable() && loc.empty())
 		throw invalid_argument(tgt.get_name()+" is not installable");