Fix coverage file generation

diff --git a/ChangeLog b/ChangeLog
index 022780bfc6a057307638662e940e557e25505917..3287ffc06c580413d80a369a60a61b798d2c9e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 14 21:15:28 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+       * src/Makefile.am: Fix generation of coverage files by
+       excluding files for server protocol
+
 Wed Jun 13 11:30:28 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
        * src/virsh.c: patch from Saori Fukuta for messages

diff --git a/src/Makefile.am b/src/Makefile.am
index f7170f207ab3218e3048dab18c652bec2a4a221f..fd596ae009866d621df5efcb22cfb6c7bcd55574 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,8 @@ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
                     -version-info @LIBVIRT_VERSION_INFO@ \
                     $(COVERAGE_CFLAGS:-f%=-Wc,-f%)
 libvirt_la_CFLAGS = $(COVERAGE_CFLAGS)
-libvirt_la_SOURCES =                                           \
+
+CLIENT_SOURCES =                                               \
                libvirt.c internal.h                            \
                hash.c hash.h                                   \
                test.c test.h                                   \
@@ -39,11 +40,15 @@ libvirt_la_SOURCES =                                                \
                proxy_internal.c proxy_internal.h               \
                conf.c conf.h                                   \
                xm_internal.c xm_internal.h                     \
-               ../qemud/protocol.h ../qemud/protocol.c         \
                qemu_internal.c qemu_internal.h                 \
-               ../qemud/remote_protocol.c ../qemud/remote_protocol.h \
                remote_internal.c remote_internal.h
 
+SERVER_SOURCES =                                               \
+               ../qemud/protocol.h ../qemud/protocol.c         \
+               ../qemud/remote_protocol.c ../qemud/remote_protocol.h
+
+libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES)
+
 bin_PROGRAMS = virsh
 
 virsh_SOURCES = virsh.c console.c console.h
@@ -58,7 +63,7 @@ virsh_CFLAGS = $(COVERAGE_CFLAGS)
 tst: tst.c
        $(CC) $(CFLAGS) -I../include -o tst tst.c .libs/libvirt.a -lxml2 -lxenstore -lpthread
 
-COVERAGE_FILES = $(libvirt_la_SOURCES:%.c=libvirt_la-%.cov)
+COVERAGE_FILES = $(CLIENT_SOURCES:%.c=libvirt_la-%.cov)
 
 cov: clean-cov $(COVERAGE_FILES)