X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=21c2bbf2019bc9fb64bbd80a2f48408d239400ea;hb=95d5743c0f2a0dd8b56928525b8caa5f6ee8cc1d;hp=adbb058dc3d192483bbfa7c03f9d042f1e8dcfdb;hpb=968db78efd29b1f4890068693728299b2c7c92c7;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index adbb058..21c2bbf 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -39,9 +39,9 @@ void FileTarget::init(const SourcePackage *p)
 
 string FileTarget::generate_name(Builder &builder, const SourcePackage *pkg, const FS::Path &path)
 {
-	if(pkg && FS::descendant_depth(path, pkg->get_source())>=0)
+	if(pkg && FS::descendant_depth(path, pkg->get_source_directory())>=0)
 	{
-		FS::Path relpath = FS::relative(path, pkg->get_source());
+		FS::Path relpath = FS::relative(path, pkg->get_source_directory());
 		return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
 	}
 	else if(FS::descendant_depth(path, builder.get_prefix())>=0)
@@ -82,3 +82,11 @@ void FileTarget::check_rebuild()
 	if(!needs_rebuild() && package && package->get_config().get_mtime()>mtime)
 		mark_rebuild("Package options changed");
 }
+
+Task *FileTarget::build()
+{
+	if(tool && !builder.get_dry_run() && mtime)
+		FS::unlink(path);
+
+	return Target::build();
+}