From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 24 Jun 2011 13:37:25 +0000 (+0100)
Subject: Fix some bugs in RPC protocol make rules
X-Git-Tag: v0.9.3-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6bf7703d0fce61b727a439bd831a34ae88ba05e;p=thirdparty%2Flibvirt.git

Fix some bugs in RPC protocol make rules

The Makefile.am rules for generating RPC protocol had a couple
of bugs

 - A instance of remote/rpcgen_fix.pl  was not changed
   to rpc/genprotocol.pl
 - A dep from rpc/virnetmessage.h on the generated
   rpc/virnetprotocol.h was missing
 - The generated rpc/virnetprotocol.[ch] were not listed
   in MAINTAINERCLEANFILES

* Makefile.am: Fix RPC protocol generation
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 52fc63cdab..7836349fcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -570,7 +570,7 @@ $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED)
 
 endif WITH_REMOTE
 
-%protocol.c: %protocol.x %protocol.h $(srcdir)/remote/rpcgen_fix.pl
+%protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl
 	$(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
 	       $< $@
 
@@ -1194,6 +1194,10 @@ EXTRA_DIST += \
        rpc/gendispatch.pl \
        rpc/genprotocol.pl
 
+VIR_NET_RPC_GENERATED = rpc/virnetprotocol.h rpc/virnetprotocol.c
+
+rpc/virnetmessage.h: $(VIR_NET_RPC_GENERATED)
+
 libvirt_net_rpc_la_SOURCES = \
 	rpc/virnetmessage.h rpc/virnetmessage.c \
 	rpc/virnetprotocol.h rpc/virnetprotocol.c \
@@ -1411,4 +1415,4 @@ endif
 
 CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
 DISTCLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(REMOTE_DRIVER_GENERATED)
+MAINTAINERCLEANFILES = $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED)