[libvirt] [PATCH] build: avoid incremental 'make syntax-check' failure

Eric Blake eblake at redhat.com
Tue Jul 12 17:16:37 UTC 2011


Incrementally running 'make syntax-check' on a tree previously
built after commit 62dee6f but before 44036460 fails sc_po_check
(because the generated qemu_dispatch.h gained translatable strings).
This is a followup to commit addaa537 for that scenario.

* cfg.mk (sc_po_check): Add another prereq.
($(srcdir)/daemon/qemu_dispatch.h): Add rule.
---

Pushing under the build-breaker rule.

 cfg.mk |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index b00cda3..5178a31 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -606,11 +606,15 @@ _autogen:
 syntax-check: $(top_srcdir)/HACKING

 # sc_po_check can fail if generated files are not built first
-sc_po_check: $(srcdir)/daemon/remote_dispatch.h \
+sc_po_check: \
+		$(srcdir)/daemon/remote_dispatch.h \
+		$(srcdir)/daemon/qemu_dispatch.h \
 		$(srcdir)/src/remote/remote_client_bodies.h
-$(srcdir)/daemon/remote_dispatch.h:
+$(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C daemon remote_dispatch.h
-$(srcdir)/src/remote/remote_client_bodies.h:
+$(srcdir)/daemon/qemu_dispatch.h: $(srcdir)/src/remote/qemu_protocol.x
+	$(MAKE) -C daemon qemu_dispatch.h
+$(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C src remote/remote_client_bodies.h

 # List all syntax-check exemptions:
-- 
1.7.4.4




More information about the libvir-list mailing list