Fix include and library search order

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index e8ed647477fcf82823f06195cfa8a7e43edf7441..b094e941e6984707f47d47e75bea1f2455188b60 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,8 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include <msp/time/utils.h>
 #include "action.h"
 #include "builder.h"
 #include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 
 using namespace std;
@@ -36,6 +44,8 @@ Target *Target::get_buildable_target()
 
 void Target::add_depend(Target *dep)
 {
+       if(dep==this)
+               throw InvalidParameterValue("A target can't depend on itself");
        depends.push_back(dep);
        dep->rdepends.push_back(this);
 }
@@ -93,8 +103,10 @@ Target::Target(Builder &b, const Package *p, const string &n):
        prepared(false),
        counted(false)
 {
+       builder.add_target(this);
+
        struct stat st;
-       if(!Path::stat(name, st))
+       if(!stat(name, st))
                mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 }
 
@@ -121,12 +133,14 @@ void Target::check_rebuild()
                for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
                {
                        if((*i)->get_mtime()>mtime)
-                               mark_rebuild(Path::basename((*i)->get_name())+" has changed");
+                               mark_rebuild(basename((*i)->get_name())+" has changed");
                        else if((*i)->get_rebuild())
-                               mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
+                               mark_rebuild(basename((*i)->get_name())+" needs rebuilding");
                }
        }
-       if(!rebuild && package && package->get_config().get_mtime()>mtime)
+
+       const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
                mark_rebuild("Package options changed");
 }