Merge branch 'dont-clean-phony' of git://github.com/pcc/ninja

Conflicts:
	src/clean.cc

diff --cc src/clean.cc
index c6a294f,2565c28..3fe23ec
--- 1/src/clean.cc
--- 2/src/clean.cc
+++ b/src/clean.cc
@@@ -123,14 -123,14 +123,16 @@@ int Cleaner::CleanAll(bool generator) 
  }
  
  void Cleaner::DoCleanTarget(Node* target) {
-   if (target->in_edge()) {
-     Remove(target->path());
-     if (!target->in_edge()->rule().depfile().empty())
-       Remove(target->in_edge()->EvaluateDepFile());
-     if (target->in_edge()->HasRspFile())
-       Remove(target->in_edge()->GetRspFile());
-     for (vector<Node*>::iterator n = target->in_edge()->inputs_.begin();
-          n != target->in_edge()->inputs_.end();
+   if (Edge* e = target->in_edge()) {
+     // Do not try to remove phony targets
+     if (!e->is_phony()) {
+       Remove(target->path());
++      if (!target->in_edge()->rule().depfile().empty())
++        Remove(target->in_edge()->EvaluateDepFile());
+       if (e->HasRspFile())
+         Remove(e->GetRspFile());
+     }
+     for (vector<Node*>::iterator n = e->inputs_.begin(); n != e->inputs_.end();
           ++n) {
        DoCleanTarget(*n);
      }

diff --cc src/clean_test.cc
Simple merge