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 1519812904289123.2972444073556; Wed, 28 Feb 2018 02:15:04 -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 E288C7FEA2; Wed, 28 Feb 2018 10:15:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9CCB60BE3; Wed, 28 Feb 2018 10:15:02 +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 589AA18033FE; Wed, 28 Feb 2018 10:15:02 +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 w1SAEoGA005680 for ; Wed, 28 Feb 2018 05:14:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 39E022026E0E; Wed, 28 Feb 2018 10:14:50 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id A071D2026E04; Wed, 28 Feb 2018 10:14:49 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:32 +0000 Message-Id: <20180228101435.464-15-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 14/17] make: split admin driver build rules into admin/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.25]); Wed, 28 Feb 2018 10:15:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 50 +------------------------------------------= ---- src/admin/Makefile.inc.am | 50 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 51 insertions(+), 49 deletions(-) create mode 100644 src/admin/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index a45f9df894..b39b846f99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,6 +98,7 @@ include security/Makefile.inc.am include access/Makefile.inc.am include logging/Makefile.inc.am include locking/Makefile.inc.am +include admin/Makefile.inc.am include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am @@ -358,30 +359,6 @@ DRIVER_SOURCES +=3D \ =20 =20 =20 -ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x - -ADMIN_PROTOCOL_GENERATED =3D \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ - admin/admin_client.h \ - admin/admin_server_dispatch_stubs.h \ - $(NULL) - -admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_client.h - -admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ - $(ADMIN_PROTOCOL) Makefile.am - $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ - admin ADMIN $(ADMIN_PROTOCOL) \ - > $(srcdir)/admin/admin_server_dispatch_stubs.h - -EXTRA_DIST +=3D $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) -BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) =20 # Ensure that we don't change the struct or member names or member ordering # in remote_protocol.x The embedded perl below needs a few comments, and @@ -751,31 +728,6 @@ libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_= SYM_FILES) \ mv $@-tmp libvirt_admin.syms =20 =20 -admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h - -noinst_LTLIBRARIES +=3D libvirt_driver_admin.la -libvirt_driver_admin_la_SOURCES =3D \ - admin/admin_protocol.c \ - admin/admin_protocol.h \ - admin/admin_server.c \ - admin/admin_server.h \ - admin/admin_server_dispatch.c \ - admin/admin_server_dispatch.h \ - admin/admin_server_dispatch_stubs.h \ - $(NULL) -libvirt_driver_admin_la_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(XDR_CFLAGS) \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/admin \ - $(NULL) -libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la -libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) - -# admin/admin_remote.c is being included in libvirt-admin.c, so we -# need to include it in the dist -EXTRA_DIST +=3D admin/admin_remote.c - lib_LTLIBRARIES +=3D libvirt-admin.la libvirt_admin_la_SOURCES =3D \ libvirt-admin.c \ diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am new file mode 100644 index 0000000000..55d721f0bf --- /dev/null +++ b/src/admin/Makefile.inc.am @@ -0,0 +1,50 @@ +ADMIN_PROTOCOL =3D $(srcdir)/admin/admin_protocol.x + +ADMIN_PROTOCOL_GENERATED =3D \ + admin/admin_protocol.c \ + admin/admin_protocol.h \ + admin/admin_client.h \ + admin/admin_server_dispatch_stubs.h \ + $(NULL) + +EXTRA_DIST +=3D $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) +MAINTAINERCLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) + +admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h + +noinst_LTLIBRARIES +=3D libvirt_driver_admin.la +libvirt_driver_admin_la_SOURCES =3D \ + admin/admin_protocol.c \ + admin/admin_protocol.h \ + admin/admin_server.c \ + admin/admin_server.h \ + admin/admin_server_dispatch.c \ + admin/admin_server_dispatch.h \ + admin/admin_server_dispatch_stubs.h \ + $(NULL) +libvirt_driver_admin_la_CFLAGS =3D \ + $(AM_CFLAGS) \ + $(XDR_CFLAGS) \ + -I$(top_srcdir)/src/util \ + -I$(top_srcdir)/src/admin \ + $(NULL) +libvirt_driver_admin_la_LIBADD =3D ../gnulib/lib/libgnu.la +libvirt_driver_admin_la_LDFLAGS =3D -module -avoid-version $(AM_LDFLAGS) + +# admin/admin_remote.c is being included in libvirt-admin.c, so we +# need to include it in the dist +EXTRA_DIST +=3D admin/admin_remote.c + + +admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \ + $(ADMIN_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dclient \ + admin ADMIN $(ADMIN_PROTOCOL) \ + > $(srcdir)/admin/admin_client.h + +admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \ + $(ADMIN_PROTOCOL) Makefile.am + $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \ + admin ADMIN $(ADMIN_PROTOCOL) \ + > $(srcdir)/admin/admin_server_dispatch_stubs.h --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list