build: Clean up use of .PHONY

* Move .PHONY directives next to targets,
  this makes them a lot harder to miss
* Add missing .PHONY directives
* Remove nonexistent .PHONY directives
* Hopefully I didn'T miss anything...

Signed-Off-By: Horms <horms@verge.net.au>

tools/python/Makefile

@@ -1,12 +1,14 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-.PHONY: all build install clean
-
+.PHONY: all
 all: build
+
+.PHONY: build
 build:
 	CFLAGS="$(CFLAGS)" python setup.py build
 
+.PHONY: install
 ifndef XEN_PYTHON_NATIVE_INSTALL
 install: all
 	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --force
@@ -15,8 +17,10 @@ install: all
 	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
 endif
 
+.PHONY: test
 test:
 	export LD_LIBRARY_PATH=$$(readlink -f ../libxc):$$(readlink -f ../xenstore); python test.py -b -u
 
+.PHONY: clean
 clean:
 	rm -rf build *.pyc *.pyo *.o *.a *~

tools/python/xen/util/diagnose.py

@@ -41,7 +41,7 @@ def diagnose(dom):
     global dompath
     
     try:
-        domain = server.xend_domain(dom)
+        domain = server.xend.domain(dom)
         state = sxp.child_value(domain, 'state')
         domid = int(sxp.child_value(domain, 'domid'))
         name = sxp.child_value(domain, 'name')