From nobody Wed May 14 18:26:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519812908313415.2795950430659; Wed, 28 Feb 2018 02:15:08 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E02F76520; Wed, 28 Feb 2018 10:15:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B1BF060C91; Wed, 28 Feb 2018 10:15:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 614A84A489; Wed, 28 Feb 2018 10:15:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1SAEqt1005695 for ; Wed, 28 Feb 2018 05:14:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id E45D02024CA8; Wed, 28 Feb 2018 10:14:51 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A7DC202699A; Wed, 28 Feb 2018 10:14:50 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:33 +0000 Message-Id: <20180228101435.464-16-berrange@redhat.com> In-Reply-To: <20180228101435.464-1-berrange@redhat.com> References: <20180228101435.464-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/17] make: split RPC build rules into rpc/Makefile.inc.am X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 28 Feb 2018 10:15:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 111 +----------------------------------- src/rpc/Makefile.inc.am | 147 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 149 insertions(+), 109 deletions(-) create mode 100644 src/rpc/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index b39b846f99..edc72e9b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,7 @@ include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am include admin/Makefile.inc.am +include rpc/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -1116,113 +1117,8 @@ uninstall-upstart: endif ! WITH_LIBVIRTD =20 =20 -noinst_LTLIBRARIES +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la +EXTRA_DIST +=3D dtrace2systemtap.pl =20 -libvirt_la_BUILT_LIBADD +=3D \ - libvirt-net-rpc.la \ - libvirt-net-rpc-server.la \ - libvirt-net-rpc-client.la - -EXTRA_DIST +=3D \ - dtrace2systemtap.pl \ - rpc/gendispatch.pl \ - rpc/genprotocol.pl \ - rpc/gensystemtap.pl \ - rpc/virnetprotocol.x \ - rpc/virkeepaliveprotocol.x - -VIR_NET_RPC_GENERATED =3D \ - rpc/virnetprotocol.h \ - rpc/virnetprotocol.c \ - rpc/virkeepaliveprotocol.h \ - rpc/virkeepaliveprotocol.c - -BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) - -libvirt_net_rpc_la_SOURCES =3D \ - rpc/virnetmessage.h rpc/virnetmessage.c \ - rpc/virnetsocket.h rpc/virnetsocket.c \ - rpc/virkeepalive.h rpc/virkeepalive.c \ - $(VIR_NET_RPC_GENERATED) -if WITH_SSH2 -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsshsession.h rpc/virnetsshsession.c -else ! WITH_SSH2 -EXTRA_DIST +=3D \ - rpc/virnetsshsession.h rpc/virnetsshsession.c -endif ! WITH_SSH2 -if WITH_GNUTLS -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnettlscontext.h rpc/virnettlscontext.c -else ! WITH_GNUTLS -EXTRA_DIST +=3D \ - rpc/virnettlscontext.h rpc/virnettlscontext.c -endif ! WITH_GNUTLS -if WITH_SASL -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -else ! WITH_SASL -EXTRA_DIST +=3D \ - rpc/virnetsaslcontext.h rpc/virnetsaslcontext.c -endif ! WITH_SASL -if WITH_LIBSSH -libvirt_net_rpc_la_SOURCES +=3D \ - rpc/virnetlibsshsession.h rpc/virnetlibsshsession.c -else ! WITH_LIBSSH -EXTRA_DIST +=3D \ - rpc/virnetlibsshsession.h rpc/virnetlibsshsession.c -endif ! WITH_LIBSSH -libvirt_net_rpc_la_CFLAGS =3D \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(SSH2_CFLAGS) \ - $(LIBSSH_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -libvirt_net_rpc_la_LDFLAGS =3D \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(SSH2_LIBS)\ - $(LIBSSH_LIBS) \ - $(SECDRIVER_LIBS) \ - $(AM_LDFLAGS) \ - $(NULL) -libvirt_net_rpc_la_LIBADD =3D \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_net_rpc_server_la_SOURCES =3D \ - rpc/virnetserverprogram.h rpc/virnetserverprogram.c \ - rpc/virnetserverservice.h rpc/virnetserverservice.c \ - rpc/virnetserverclient.h rpc/virnetserverclient.c \ - rpc/virnetservermdns.h rpc/virnetservermdns.c \ - rpc/virnetdaemon.h rpc/virnetdaemon.c \ - rpc/virnetserver.h rpc/virnetserver.c -libvirt_net_rpc_server_la_CFLAGS =3D \ - $(AVAHI_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(XDR_CFLAGS) \ - $(AM_CFLAGS) -libvirt_net_rpc_server_la_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(AVAHI_LIBS) \ - $(DBUS_LIBS) \ - $(NULL) -libvirt_net_rpc_server_la_LIBADD =3D \ - $(CYGWIN_EXTRA_LIBADD) - -libvirt_net_rpc_client_la_SOURCES =3D \ - rpc/virnetclientprogram.h rpc/virnetclientprogram.c \ - rpc/virnetclientstream.h rpc/virnetclientstream.c \ - rpc/virnetclient.h rpc/virnetclient.c -libvirt_net_rpc_client_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) -libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_net_rpc_client_la_LIBADD =3D \ - $(CYGWIN_EXTRA_LIBADD) =20 if WITH_LIBVIRTD libexec_PROGRAMS +=3D libvirt_iohelper @@ -1336,6 +1232,3 @@ uninstall-local:: uninstall-init uninstall-systemd un= install-upstart \ =20 CLEANFILES +=3D *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES +=3D $(GENERATED_SYM_FILES) -MAINTAINERCLEANFILES +=3D \ - $(VIR_NET_RPC_GENERATED) \ - $(NULL) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am new file mode 100644 index 0000000000..14c798d05d --- /dev/null +++ b/src/rpc/Makefile.inc.am @@ -0,0 +1,147 @@ +EXTRA_DIST +=3D \ + rpc/gendispatch.pl \ + rpc/genprotocol.pl \ + rpc/gensystemtap.pl \ + rpc/virnetprotocol.x \ + rpc/virkeepaliveprotocol.x \ + $(NULL) + +VIR_NET_RPC_GENERATED =3D \ + rpc/virnetprotocol.h \ + rpc/virnetprotocol.c \ + rpc/virkeepaliveprotocol.h \ + rpc/virkeepaliveprotocol.c \ + $(NULL) + +BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) +MAINTAINERCLEANFILES +=3D $(VIR_NET_RPC_GENERATED) + +noinst_LTLIBRARIES +=3D \ + libvirt-net-rpc.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc-client.la \ + $(NULL) + +libvirt_la_BUILT_LIBADD +=3D \ + libvirt-net-rpc.la \ + libvirt-net-rpc-server.la \ + libvirt-net-rpc-client.la \ + $(NULL) + +libvirt_net_rpc_la_SOURCES =3D \ + rpc/virnetmessage.h \ + rpc/virnetmessage.c \ + rpc/virnetsocket.h \ + rpc/virnetsocket.c \ + rpc/virkeepalive.h \ + rpc/virkeepalive.c \ + $(VIR_NET_RPC_GENERATED) \ + $(NULL) + +if WITH_SSH2 +libvirt_net_rpc_la_SOURCES +=3D \ + rpc/virnetsshsession.h \ + rpc/virnetsshsession.c \ + $(NULL) +else ! WITH_SSH2 +EXTRA_DIST +=3D \ + rpc/virnetsshsession.h \ + rpc/virnetsshsession.c \ + $(NULL) +endif ! WITH_SSH2 + +if WITH_GNUTLS +libvirt_net_rpc_la_SOURCES +=3D \ + rpc/virnettlscontext.h \ + rpc/virnettlscontext.c \ + $(NULL) +else ! WITH_GNUTLS +EXTRA_DIST +=3D \ + rpc/virnettlscontext.h \ + rpc/virnettlscontext.c \ + $(NULL) +endif ! WITH_GNUTLS + +if WITH_SASL +libvirt_net_rpc_la_SOURCES +=3D \ + rpc/virnetsaslcontext.h \ + rpc/virnetsaslcontext.c \ + $(NULL) +else ! WITH_SASL +EXTRA_DIST +=3D \ + rpc/virnetsaslcontext.h \ + rpc/virnetsaslcontext.c \ + $(NULL) +endif ! WITH_SASL + +if WITH_LIBSSH +libvirt_net_rpc_la_SOURCES +=3D \ + rpc/virnetlibsshsession.h \ + rpc/virnetlibsshsession.c \ + $(NULL) +else ! WITH_LIBSSH +EXTRA_DIST +=3D \ + rpc/virnetlibsshsession.h \ + rpc/virnetlibsshsession.c \ + $(NULL) +endif ! WITH_LIBSSH + +libvirt_net_rpc_la_CFLAGS =3D \ + $(GNUTLS_CFLAGS) \ + $(SASL_CFLAGS) \ + $(SSH2_CFLAGS) \ + $(LIBSSH_CFLAGS) \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_net_rpc_la_LDFLAGS =3D \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(SSH2_LIBS)\ + $(LIBSSH_LIBS) \ + $(SECDRIVER_LIBS) \ + $(AM_LDFLAGS) \ + $(NULL) +libvirt_net_rpc_la_LIBADD =3D $(CYGWIN_EXTRA_LIBADD) + +libvirt_net_rpc_server_la_SOURCES =3D \ + rpc/virnetserverprogram.h \ + rpc/virnetserverprogram.c \ + rpc/virnetserverservice.h \ + rpc/virnetserverservice.c \ + rpc/virnetserverclient.h \ + rpc/virnetserverclient.c \ + rpc/virnetservermdns.h \ + rpc/virnetservermdns.c \ + rpc/virnetdaemon.h \ + rpc/virnetdaemon.c \ + rpc/virnetserver.h \ + rpc/virnetserver.c \ + $(NULL) +libvirt_net_rpc_server_la_CFLAGS =3D \ + $(AVAHI_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_net_rpc_server_la_LDFLAGS =3D \ + $(AM_LDFLAGS) \ + $(AVAHI_LIBS) \ + $(DBUS_LIBS) \ + $(NULL) +libvirt_net_rpc_server_la_LIBADD =3D $(CYGWIN_EXTRA_LIBADD) + +libvirt_net_rpc_client_la_SOURCES =3D \ + rpc/virnetclientprogram.h \ + rpc/virnetclientprogram.c \ + rpc/virnetclientstream.h \ + rpc/virnetclientstream.c \ + rpc/virnetclient.h \ + rpc/virnetclient.c \ + $(NULL) +libvirt_net_rpc_client_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + $(XDR_CFLAGS) \ + $(NULL) +libvirt_net_rpc_client_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_net_rpc_client_la_LIBADD =3D $(CYGWIN_EXTRA_LIBADD) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list