Minor refactoring to consolidate power management changes to a single patch.

diff --git a/master/fix-build-race b/master/fix-build-race
deleted file mode 100644 (file)
index 3cc867a..0000000
--- a/master/fix-build-race
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
-index 28d51a5..bf335af 100644
---- a/tools/xenpmd/Makefile
-+++ b/tools/xenpmd/Makefile
-@@ -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)
-+all: $(BIN)
- 
- $(BIN): xenpmd.o acpi-events.o xenpmd-dbus-server.o
- 
-@@ -22,11 +21,13 @@ install: all
- 
- .PHONY: clean
- clean:
--      $(RM) -f $(BIN) *.o $(GENERATE_HEADERS)
-+      $(RM) -f $(BIN) *.o  xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
- 
- %.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 $< > $@ 
- 

diff --git a/master/power-management-enhancement b/master/power-management-enhancement
index 49b83ff04dd77687e966acd7e92f9f8ec67344d4..a6d62fe70afe6681b5a3544cefff90129e9ef30e 100644 (file)
--- a/master/power-management-enhancement
+++ b/master/power-management-enhancement
@@ -257,10 +257,10 @@ index afb78b6..8f2d7a7 100644
  }
  
 diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
-index 10cb2fb..28d51a5 100644
+index 10cb2fb..bf335af 100644
 --- a/tools/xenpmd/Makefile
 +++ b/tools/xenpmd/Makefile
-@@ -3,12 +3,17 @@ include $(XEN_ROOT)/tools/Rules.mk
+@@ -3,13 +3,17 @@ include $(XEN_ROOT)/tools/Rules.mk
  
  CFLAGS  += -Werror
  CFLAGS  += $(CFLAGS_libxenstore)
@@ -269,28 +269,29 @@ index 10cb2fb..28d51a5 100644
 +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: $(BIN)
-+all: $(GENERATE_HEADERS) $(BIN)
-+
-+$(BIN): xenpmd.o acpi-events.o xenpmd-dbus-server.o
+ all: $(BIN)
  
++$(BIN): xenpmd.o acpi-events.o xenpmd-dbus-server.o
++
  .PHONY: install
  install: all
-@@ -17,9 +22,15 @@ install: all
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+@@ -17,9 +21,17 @@ install: all
  
  .PHONY: clean
  clean:
 -      $(RM) -f $(BIN) $(DEPS)
-+      $(RM) -f $(BIN) *.o $(GENERATE_HEADERS)
++      $(RM) -f $(BIN) *.o  xenpmd-dbus-server-bindings.h xenpmd-dbus-client-bindings.h
  
 -%: %.c Makefile
 +%.o: %.c Makefile
        $(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
  
 --include $(DEPS)
++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 $< > $@ 
 +

diff --git a/master/series b/master/series
index fb8019a0c5fb68e99737807f51265c83e741dbdd..1bb39e5957aba5794ab54e9fdf2c3d9146e00648 100644 (file)
--- a/master/series
+++ b/master/series
@@ -32,5 +32,4 @@ hack-vbe-dont-check-mem
 hp-host-resume-workaround
 cope-with-dead-serial
 reset-atapi-after-failed-cd-boot
-fix-build-race
 vga-edid