Clean up the makefile and add a missing 'static'.

Change-Id: I9665c4c2ed6e2b4e9ad84e6c476d54b4e90a011c
diff --git a/src/thread.h b/src/thread.h
index 112a1ef..d345fdf 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -458,7 +458,7 @@
   void DumpStack(std::ostream& os) const;
 
   // Out-of-line conveniences for debugging in gdb.
-  Thread* CurrentFromGdb() const; // Like Thread::Current.
+  static Thread* CurrentFromGdb(); // Like Thread::Current.
   void DumpFromGdb() const; // Like Thread::Dump(std::cerr).
 
   void Attach(const Runtime* runtime);