daemon: Don't just include admin RPC

So, it's a little paradox that we use the file twice. Firstly to build
libvirt-admin.la (a client side of the Admin API), then once again to
build the server side. Well, the problem is, this does not play nicely
with the distclean since the file is generated. So while it's removed
in the src/ the distclean running in daemon/ will not find the file
and fail. The file is needed because it contains the RPC wrappers. So
let's leave the client code as is and from the daemon/ just link the
client library. The linker will find desired symbols and use them.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b9c089d0e960bc97f404b1a5c3112038b1c40b8f..d3fc029f0580f464e1c220ef34a55c67cace9d18 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -128,8 +128,7 @@ libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)
 
 noinst_LTLIBRARIES += libvirtd_admin.la
 libvirtd_admin_la_SOURCES = \
-               admin_server.c admin_server.h \
-               ../src/admin/admin_protocol.c
+               admin_server.c admin_server.h
 
 libvirtd_admin_la_CFLAGS = \
                $(AM_CFLAGS)            \
@@ -145,6 +144,9 @@ libvirtd_admin_la_LDFLAGS = \
                $(COVERAGE_LDFLAGS)     \
                $(NO_INDIRECT_LDFLAGS)
 
+libvirtd_admin_la_LIBADD =     \
+               ../src/libvirt-admin.la
+
 man8_MANS = libvirtd.8
 
 sbin_PROGRAMS = libvirtd