From nobody Wed May 14 18:25:00 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 1519812889125593.6274306673934; Wed, 28 Feb 2018 02:14:49 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3102C057F81; Wed, 28 Feb 2018 10:14:47 +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 AFF505D9C8; Wed, 28 Feb 2018 10:14:47 +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 770C74A475; Wed, 28 Feb 2018 10:14:47 +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 w1SAEhRO005598 for ; Wed, 28 Feb 2018 05:14:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 004602024CA8; Wed, 28 Feb 2018 10:14:43 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CEC5202699A; Wed, 28 Feb 2018 10:14:42 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:23 +0000 Message-Id: <20180228101435.464-6-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 05/17] make: split secret driver build rules into secret/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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 28 Feb 2018 10:14:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 29 +---------------------------- src/secret/Makefile.inc.am | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 src/secret/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index bbaab675f5..6518464639 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -102,6 +102,7 @@ include interface/Makefile.inc.am include network/Makefile.inc.am include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am +include secret/Makefile.inc.am =20 =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -783,12 +784,10 @@ EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ - $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(NULL) =20 @@ -823,12 +822,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ security/virt-aa-helper.c =20 =20 -SECRET_UTIL_SOURCES =3D \ - secret/secret_util.h secret/secret_util.c - -SECRET_DRIVER_SOURCES =3D \ - secret/secret_driver.h secret/secret_driver.c - # Storage backend specific impls STORAGE_DRIVER_BACKEND_SOURCES =3D \ storage/storage_backend.h storage/storage_backend.c @@ -981,12 +974,6 @@ libvirt_cpu_la_CFLAGS =3D \ -I$(srcdir)/conf $(AM_CFLAGS) libvirt_cpu_la_SOURCES =3D $(CPU_SOURCES) =20 -noinst_LTLIBRARIES +=3D libvirt_secret.la -libvirt_la_BUILT_LIBADD +=3D libvirt_secret.la -libvirt_secret_la_CFLAGS =3D $(AM_CFLAGS) -libvirt_secret_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_secret_la_SOURCES =3D $(SECRET_UTIL_SOURCES) - if WITH_VMX noinst_LTLIBRARIES +=3D libvirt_vmx.la libvirt_la_BUILT_LIBADD +=3D libvirt_vmx.la @@ -1126,18 +1113,6 @@ EXTRA_DIST +=3D \ =20 =20 =20 - -if WITH_SECRETS -mod_LTLIBRARIES +=3D libvirt_driver_secret.la -libvirt_driver_secret_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_secret_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES) -endif WITH_SECRETS - # Needed to keep automake quiet about conditionals libvirt_driver_storage_impl_la_SOURCES =3D libvirt_driver_storage_impl_la_CFLAGS =3D \ @@ -1433,8 +1408,6 @@ EXTRA_DIST +=3D \ $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ - $(SECRET_DRIVER_SOURCES) \ - $(SECRET_UTIL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) =20 check-local: check-augeas diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am new file mode 100644 index 0000000000..305c4a1ead --- /dev/null +++ b/src/secret/Makefile.inc.am @@ -0,0 +1,38 @@ +SECRET_DRIVER_SOURCES =3D \ + secret/secret_driver.h \ + secret/secret_driver.c \ + $(NULL) + +SECRET_UTIL_SOURCES =3D \ + secret/secret_util.h \ + secret/secret_util.c \ + $(NULL) + + +DRIVER_SOURCE_FILES +=3D $(SECRET_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(SECRET_DRIVER_SOURCES) +EXTRA_DIST +=3D \ + $(SECRET_DRIVER_SOURCES) \ + $(SECRET_UTIL_SOURCESQ) \ + $(NULL) + +noinst_LTLIBRARIES +=3D libvirt_secret.la +libvirt_la_BUILT_LIBADD +=3D libvirt_secret.la +libvirt_secret_la_CFLAGS =3D $(AM_CFLAGS) +libvirt_secret_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_secret_la_SOURCES =3D $(SECRET_UTIL_SOURCES) + +if WITH_SECRETS +mod_LTLIBRARIES +=3D libvirt_driver_secret.la +libvirt_driver_secret_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_secret_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES) +endif WITH_SECRETS --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list