From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 24 Jun 2011 14:04:11 +0000 (+0100)
Subject: Make sure virnetprotocol.[ch] are in BUILT_SOURCES
X-Git-Tag: v0.9.3-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=789ab2cc9fd72c332319aa320705e84c31059793;p=thirdparty%2Flibvirt.git

Make sure virnetprotocol.[ch] are in BUILT_SOURCES

To ensure virnetprotocol.[ch] are generated before any other
files, add them to BUILT_SOURCES and MAINTAINERCLEANFILES.
At the same time, move ESX_DRIVER_GENERATED out of DISTCLEAN
and into MAINTAINERCLEANFILES, since they are included in
EXTRA_DIST

* src/Makefile.am: Add virnetprotocol.[ch] to BUILT_SOURCES
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 7836349fcb..e32740d8cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1099,7 +1099,9 @@ EXTRA_DIST += \
   libvirt_vmx.syms		\
   libvirt_xenxs.syms
 
-BUILT_SOURCES += libvirt.syms libvirt.def libvirt_qemu.def
+GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def
+
+BUILT_SOURCES += $(GENERATED_SYM_FILES)
 
 libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) \
 		$(top_builddir)/config.status
@@ -1196,7 +1198,7 @@ EXTRA_DIST += \
 
 VIR_NET_RPC_GENERATED = rpc/virnetprotocol.h rpc/virnetprotocol.c
 
-rpc/virnetmessage.h: $(VIR_NET_RPC_GENERATED)
+BUILT_SOURCES += $(VIR_NET_RPC_GENERATED)
 
 libvirt_net_rpc_la_SOURCES = \
 	rpc/virnetmessage.h rpc/virnetmessage.c \
@@ -1414,5 +1416,5 @@ endif
 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:
 
 CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
-DISTCLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED)
+DISTCLEANFILES = $(GENERATED_SYM_FILES)
+MAINTAINERCLEANFILES = $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) $(ESX_DRIVER_GENERATED)