From nobody Mon Feb 9 01:45:38 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1564420329; cv=none; d=zoho.com; s=zohoarc; b=m2wEwwl6vIOOoMLnT/P+poKKC0vb/YVdEBaG7PDYtri0PjbACkb0Tpcxbuah9LII0Iqmp7DRSp1ZclH2OSW0myYLU8/G9+xsN9nfzW5Yh3h2Ksa8HFAjBpeBLju69zk6DQZFc/oV6MgRffLtBExad0eMXxHMz8NQ+0nei5LwSO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564420329; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZxbFfd+Xoq+EnSSeLRcCDOPfZU87cEUwJeDEAenYunE=; b=m8DYV269xb8MPkKX53agAmBHZqyhVhCSUS2PQmHZkfNKzRWMI3MIpG+se4mYEKjIX9SusaYumASj6hNNJ9qhPd9lJtiSZ1CXEGwPohhIDH0H8BPFqlNOFnsi4cer87Bu0ZPu4oBQUJ3BCkdS2QA1T/+9InMkfR6Gfd9QIxAav7I= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1564420329874785.0505629471824; Mon, 29 Jul 2019 10:12:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C48CFE8CC6; Mon, 29 Jul 2019 17:12:08 +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 63F8E5C232; Mon, 29 Jul 2019 17:12:08 +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 27C2219732; Mon, 29 Jul 2019 17:12:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6THBvg8027324 for ; Mon, 29 Jul 2019 13:11:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2619B5C238; Mon, 29 Jul 2019 17:11:57 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0CD15C1A1; Mon, 29 Jul 2019 17:11:55 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 29 Jul 2019 18:10:56 +0100 Message-Id: <20190729171130.25484-15-berrange@redhat.com> In-Reply-To: <20190729171130.25484-1-berrange@redhat.com> References: <20190729171130.25484-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH v3 14/48] remote: refactor & rename variables for building libvirtd 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 29 Jul 2019 17:12:09 +0000 (UTC) The same make variables will be useful for building both libvirtd and the split daemons, so refactor & rename variables to facilitate reuse. Automake gets annoyed if you define a variable ending LDFLAGS: src/remote/Makefile.inc.am:53: warning: variable 'REMOTE_DAEMON_LDFLAGS' is= defined but no program or src/remote/Makefile.inc.am:53: library has 'REMOTE_DAEMON' as canonical nam= e (possible typo) So we trick it by using an LD_FLAGS or LD_ADD suffix instead. LIBSOCKET is dropped as it is only set on Windows and we don't build the libvirtd daemon under mingw. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- src/remote/Makefile.inc.am | 94 ++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 45dd6cc1cb..0ec7abb880 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -18,13 +18,13 @@ REMOTE_DRIVER_SOURCES =3D \ $(REMOTE_DRIVER_GENERATED) \ $(NULL) =20 -LIBVIRTD_GENERATED =3D \ +REMOTE_DAEMON_GENERATED =3D \ remote/remote_daemon_dispatch_stubs.h \ remote/remote_daemon_dispatch_lxc_stubs.h \ remote/remote_daemon_dispatch_qemu_stubs.h \ $(NULL) =20 -LIBVIRTD_SOURCES =3D \ +REMOTE_DAEMON_SOURCES =3D \ remote/remote_daemon.c \ remote/remote_daemon.h \ remote/remote_daemon_config.c \ @@ -33,9 +33,49 @@ LIBVIRTD_SOURCES =3D \ remote/remote_daemon_dispatch.h \ remote/remote_daemon_stream.c \ remote/remote_daemon_stream.h \ - $(LIBVIRTD_GENERATED) \ + $(REMOTE_DAEMON_GENERATED) \ $(NULL) =20 +REMOTE_DAEMON_CFLAGS =3D \ + $(LIBXML_CFLAGS) \ + $(GNUTLS_CFLAGS) \ + $(SASL_CFLAGS) \ + $(XDR_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(WARN_CFLAGS) \ + $(PIE_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/rpc \ + $(NULL) + +REMOTE_DAEMON_LD_FLAGS =3D \ + $(RELRO_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(NO_UNDEFINED_LDFLAGS) \ + $(NULL) + +REMOTE_DAEMON_LD_ADD =3D \ + libvirt_driver_admin.la \ + libvirt-lxc.la \ + libvirt-qemu.la \ + libvirt.la \ + $(LIBXML_LIBS) \ + $(GNUTLS_LIBS) \ + $(SASL_LIBS) \ + $(DBUS_LIBS) \ + $(LIBNL_LIBS) \ + $(NULL) + +if WITH_DTRACE_PROBES +REMOTE_DAEMON_LD_ADD +=3D ../src/libvirt_probes.lo +endif WITH_DTRACE_PROBES + +REMOTE_DAEMON_LD_ADD +=3D \ + ../gnulib/lib/libgnu.la \ + $(NULL) =20 LOGROTATE_FILES_IN +=3D \ remote/libvirtd.qemu.logrotate.in \ @@ -73,7 +113,7 @@ DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(REMOTE_DRIVER_PROTOCOL) \ $(REMOTE_DRIVER_SOURCES) \ - $(LIBVIRTD_SOURCES) \ + $(REMOTE_DAEMON_SOURCES) \ remote/test_libvirtd.aug.in \ remote/libvirtd.aug.in \ remote/libvirtd.conf.in \ @@ -87,11 +127,11 @@ EXTRA_DIST +=3D \ # the WITH_REMOTE/WITH_LIBVIRTD conditionals BUILT_SOURCES +=3D \ $(REMOTE_DRIVER_GENERATED) \ - $(LIBVIRTD_GENERATED) \ + $(REMOTE_DAEMON_GENERATED) \ $(NULL) MAINTAINERCLEANFILES +=3D \ $(REMOTE_DRIVER_GENERATED) \ - $(LIBVIRTD_GENERATED) \ + $(REMOTE_DAEMON_GENERATED) \ $(NULL) CLEANFILES +=3D \ remote/libvirtd.conf \ @@ -137,52 +177,18 @@ CLEANFILES +=3D remote/libvirtd.aug =20 man8_MANS +=3D libvirtd.8 =20 -libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES) +libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) =20 libvirtd_CFLAGS =3D \ - $(LIBXML_CFLAGS) \ - $(GNUTLS_CFLAGS) \ - $(SASL_CFLAGS) \ - $(XDR_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ - $(PIE_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ + $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ -DDAEMON_NAME=3D"\"libvirtd\"" \ -DENABLE_IP \ $(NULL) =20 -libvirtd_LDFLAGS =3D \ - $(RELRO_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NO_INDIRECT_LDFLAGS) \ - $(NO_UNDEFINED_LDFLAGS) \ - $(NULL) +libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) =20 -libvirtd_LDADD =3D \ - libvirt_driver_admin.la \ - libvirt-lxc.la \ - libvirt-qemu.la \ - libvirt.la \ - $(LIBXML_LIBS) \ - $(GNUTLS_LIBS) \ - $(SASL_LIBS) \ - $(DBUS_LIBS) \ - $(LIBNL_LIBS) \ - $(NULL) - -if WITH_DTRACE_PROBES -libvirtd_LDADD +=3D ../src/libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirtd_LDADD +=3D \ - ../gnulib/lib/libgnu.la \ - $(LIBSOCKET) \ - $(NULL) +libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 remote/libvirtd.conf: remote/libvirtd.conf.in $(AM_V_GEN)$(SED) \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list