From: James Mckenzie <jamesmck@british-chap.cam.xci-test.com>
Date: Fri, 11 Dec 2009 09:49:09 +0000 (+0000)
Subject: try again, the rule I added was overwridden
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ec85d62e43e851f17d7fb5470fb26d2b3887f70b;p=xenclient%2Fxen-pq.git

try again, the rule I added was overwridden
---

diff --git a/master/fix-build-race b/master/fix-build-race
index be85aab..3cc867a 100644
--- a/master/fix-build-race
+++ b/master/fix-build-race
@@ -1,9 +1,12 @@
 diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
-index 28d51a5..2735d7a 100644
+index 28d51a5..bf335af 100644
 --- a/tools/xenpmd/Makefile
 +++ b/tools/xenpmd/Makefile
-@@ -11,7 +11,7 @@ BIN      = xenpmd
- GENERATE_HEADERS = xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
+@@ -8,10 +8,9 @@ LDFLAGS += $(LDFLAGS_libxenstore)
+ LDFLAGS += -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lglib-2.0 -lintl
+ 
+ BIN      = xenpmd
+-GENERATE_HEADERS = xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
  
  .PHONY: all
 -all: $(GENERATE_HEADERS) $(BIN)
@@ -11,12 +14,18 @@ index 28d51a5..2735d7a 100644
  
  $(BIN): xenpmd.o acpi-events.o xenpmd-dbus-server.o
  
-@@ -24,7 +24,7 @@ install: all
+@@ -22,11 +21,13 @@ install: all
+ 
+ .PHONY: clean
  clean:
- 	$(RM) -f $(BIN) *.o $(GENERATE_HEADERS)
+-	$(RM) -f $(BIN) *.o $(GENERATE_HEADERS)
++	$(RM) -f $(BIN) *.o  xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
  
--%.o: %.c Makefile
-+%.o: %.c Makefile ${GENERATE_HEADERS}
+ %.o: %.c Makefile
  	$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
  
++xenpmd-dbus-server.o: xenpmd-dbus-server.c xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
++
  xenpmd-dbus-server-bindings.h:xenpmd.xml
+ 	dbus-binding-tool --mode=glib-server --prefix=xenpmd_object $< > $@ 
+