[libvirt] [PATCH] daemon: Don't just include admin RPC

[Eric Blake]

On 06/17/2015 10:10 AM, Michal Privoznik wrote:
> 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 at redhat.com>
> ---
>  daemon/Makefile.am | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

ACK.

> 
> diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> index b9c089d..d3fc029 100644
> --- 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

Indeed, any makefile dependency on ../xxx is liable to cause distclean
chaos.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150617/7286d9f4/attachment-0001.sig>