From nobody Sun Feb 8 21:29:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 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=1571918008; cv=none; d=zoho.com; s=zohoarc; b=I9TOxiUl+kMcmTQzfG4bslRhLxFMxXderzNe39uYO53gSrlq1bj9qBb0hq5xhvqOPr1HvtTSk3DSZI78GjeLx3O1r0hwslgIedsbNHH0qtZM72abxL0DdiMdMgN+4WEoHOgGK08RZrh/9n6WJQP26k1cJdOkfvFlNnQLSasIocE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571918008; h=Content-Type:Content-Transfer-Encoding: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; bh=ybgu8yp5Sydi5tmI4uRE6nB2tNmmjVSVZP5Wb1jHjiU=; b=j0HCQYtbCWEUDGRMipb51tRvDPbvIpbXAu76r/blFo1hzEQqgE4D5j1U08ARYS1qvJxM22Yi/CQeKYjv+3uiLIC3PTFfs3tRjT2vzmrEntTrtR+32EgaGAK+/neIpNHrODnD5vGePBFFFKp7IlXFspaEoZLRt9Tq01tRttdPYKU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571918008409145.73446040868623; Thu, 24 Oct 2019 04:53:28 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-7tY8Ja9uNJCy9DU-eO-UmA-1; Thu, 24 Oct 2019 07:51:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41F87800D5A; Thu, 24 Oct 2019 11:51:51 +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 1F21862A75; Thu, 24 Oct 2019 11:51:51 +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 D09764EEBD; Thu, 24 Oct 2019 11:51:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpnoW032603 for ; Thu, 24 Oct 2019 07:51:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE300601B7; Thu, 24 Oct 2019 11:51:49 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id C25206012D for ; Thu, 24 Oct 2019 11:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571918007; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ybgu8yp5Sydi5tmI4uRE6nB2tNmmjVSVZP5Wb1jHjiU=; b=auEOSMfvFY5JxqTNdySwz6GDHBGBLy6GxgQKasQ2SpyKzHR8T34cexbeMiG/dqI4va+b1Y MVKCdLfb+pceCrYT62ujJOc+9QKWl9zK1AkzEJ99Ck22yFMSDAlq8M8xCx92YKwJYVid85 4PKG7i9iz5d5OrBLgi/dD3WF8npT4c4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:51:01 +0200 Message-Id: <066eebd04fe546f5bdfc76c29a5512dc5a9f5a27.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 19/20] src: stop distributing generated source files 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 7tY8Ja9uNJCy9DU-eO-UmA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=C3=A1n Tomko --- src/Makefile.am | 6 +++--- src/access/Makefile.inc.am | 3 ++- src/admin/Makefile.inc.am | 13 +++++++------ src/bhyve/Makefile.inc.am | 1 + src/esx/Makefile.inc.am | 4 +--- src/hyperv/Makefile.inc.am | 4 +--- src/interface/Makefile.inc.am | 1 + src/libxl/Makefile.inc.am | 1 + src/locking/Makefile.inc.am | 8 +++++--- src/logging/Makefile.inc.am | 12 +++++++----- src/lxc/Makefile.inc.am | 27 ++++++++++++++++++--------- src/network/Makefile.inc.am | 1 + src/node_device/Makefile.inc.am | 1 + src/nwfilter/Makefile.inc.am | 1 + src/qemu/Makefile.inc.am | 1 + src/remote/Makefile.inc.am | 20 ++++++++++++-------- src/rpc/Makefile.inc.am | 5 ++++- src/secret/Makefile.inc.am | 1 + src/storage/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 6 ++++-- src/vbox/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 22 files changed, 75 insertions(+), 44 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index da7e2e6c80..4a0c121a7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -655,13 +655,13 @@ endif WITH_LIBVIRTD < $< > $@-t && \ mv $@-t $@ =20 -CLEANFILES +=3D $(man8_MANS) -MAINTAINERCLEANFILES +=3D $(MANINFILES) +CLEANFILES +=3D \ + $(man8_MANS) \ + $(MANINFILES) =20 EXTRA_DIST +=3D \ $(SYSTEMD_UNIT_FILES_IN) \ $(PODFILES) \ - $(MANINFILES) \ $(NULL) =20 =20 diff --git a/src/access/Makefile.inc.am b/src/access/Makefile.inc.am index 2d871ec8aa..fd0a5d8098 100644 --- a/src/access/Makefile.inc.am +++ b/src/access/Makefile.inc.am @@ -43,13 +43,14 @@ ACCESS_DRIVER_POLKIT_POLICY =3D access/org.libvirt.api.= policy GENERATED_SYM_FILES +=3D $(ACCESS_DRIVER_SYM_FILES) =20 EXTRA_DIST +=3D \ - $(ACCESS_DRIVER_POLKIT_POLICY) \ access/genpolkit.pl \ $(NULL) =20 =20 libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_SOURCES) \ + $(NULL) +nodist_libvirt_driver_access_la_SOURCES =3D \ $(ACCESS_DRIVER_GENERATED) \ $(NULL) noinst_LTLIBRARIES +=3D libvirt_driver_access.la diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am index 448f7e1203..3feb23aa20 100644 --- a/src/admin/Makefile.inc.am +++ b/src/admin/Makefile.inc.am @@ -9,22 +9,21 @@ ADMIN_PROTOCOL_GENERATED =3D \ admin/admin_server_dispatch_stubs.h \ $(NULL) =20 -EXTRA_DIST +=3D $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED) +EXTRA_DIST +=3D $(ADMIN_PROTOCOL) BUILT_SOURCES +=3D $(ADMIN_PROTOCOL_GENERATED) -MAINTAINERCLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) +CLEANFILES +=3D $(ADMIN_PROTOCOL_GENERATED) =20 admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h =20 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) +nodist_libvirt_driver_admin_la_SOURCES =3D \ + $(ADMIN_PROTOCOL_GENERATED) libvirt_driver_admin_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(XDR_CFLAGS) \ @@ -60,9 +59,11 @@ lib_LTLIBRARIES +=3D libvirt-admin.la =20 libvirt_admin_la_SOURCES =3D \ admin/libvirt-admin.c \ - $(ADMIN_PROTOCOL_GENERATED) \ $(DATATYPES_SOURCES) =20 +nodist_libvirt_admin_la_SOURCES =3D \ + $(ADMIN_PROTOCOL_GENERATED) + libvirt_admin_la_LDFLAGS =3D \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_ADMIN_SYMBOL_FILE) \ -version-info $(LIBVIRT_VERSION_INFO) \ diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 96ae2f5044..de9fbe9239 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -56,6 +56,7 @@ augeastest_DATA +=3D bhyve/test_virtbhyved.aug CLEANFILES +=3D bhyve/virtbhyved.aug =20 virtbhyved_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtbhyved_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtbhyved_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtbhyved\"" \ diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am index 7ba9fd1758..6b10755b7e 100644 --- a/src/esx/Makefile.inc.am +++ b/src/esx/Makefile.inc.am @@ -44,7 +44,6 @@ ESX_DRIVER_EXTRA_DIST =3D \ esx/README \ esx/esx_vi_generator.input \ esx/esx_vi_generator.py \ - $(ESX_DRIVER_GENERATED) \ $(NULL) =20 ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp @@ -54,7 +53,6 @@ DRIVER_SOURCE_FILES +=3D $(ESX_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(ESX_DRIVER_SOURCES) \ $(ESX_DRIVER_EXTRA_DIST) \ - $(ESX_GENERATED_STAMP) \ $(NULL) =20 BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) @@ -66,7 +64,7 @@ $(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.in= put \ $(AM_V_GEN) $(RUNUTF8) $(PYTHON) \ $(srcdir)/esx/esx_vi_generator.py $(srcdir) $(builddir) && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) +CLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) =20 if WITH_ESX USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am index 79e94d09bb..b71602c971 100644 --- a/src/hyperv/Makefile.inc.am +++ b/src/hyperv/Makefile.inc.am @@ -24,8 +24,6 @@ HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp HYPERV_DRIVER_EXTRA_DIST =3D \ hyperv/hyperv_wmi_generator.input \ hyperv/hyperv_wmi_generator.py \ - $(HYPERV_DRIVER_GENERATED) \ - $(HYPERV_GENERATED_STAMP) \ $(NULL) =20 DRIVER_SOURCE_FILES +=3D $(HYPERV_DRIVER_SOURCES) @@ -45,7 +43,7 @@ $(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_ge= nerator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py $(srcdir) $(builddir) \ && touch $@ =20 -MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) +CLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) =20 if WITH_HYPERV noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 30ea98ad15..5f22b90cb4 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -52,6 +52,7 @@ augeastest_DATA +=3D interface/test_virtinterfaced.aug CLEANFILES +=3D interface/virtinterfaced.aug =20 virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtinterfaced_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtinterfaced\"" \ diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 5d9cf14f7f..8686e78a5d 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -64,6 +64,7 @@ augeastest_DATA +=3D libxl/test_virtxend.aug CLEANFILES +=3D libxl/virtxend.aug =20 virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtxend_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtxend_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtxend\"" \ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 2bfb662016..5c2361a581 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -43,8 +43,6 @@ LOCK_DAEMON_SOURCES =3D \ =20 EXTRA_DIST +=3D \ $(LOCK_PROTOCOL) \ - $(LOCK_PROTOCOL_GENERATED) \ - $(LOCK_DAEMON_GENERATED) \ $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_DRIVER_SOURCES) \ @@ -64,7 +62,7 @@ BUILT_SOURCES +=3D \ $(LOCK_DAEMON_GENERATED) \ $(NULL) =20 -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) @@ -105,6 +103,8 @@ if WITH_LIBVIRTD lockdriver_LTLIBRARIES +=3D lockd.la lockd_la_SOURCES =3D \ $(LOCK_DRIVER_LOCKD_SOURCES) \ + $(NULL) +nodist_lockd_la_SOURCES =3D \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) lockd_la_CFLAGS =3D \ @@ -145,6 +145,8 @@ sbin_PROGRAMS +=3D virtlockd =20 virtlockd_SOURCES =3D \ $(LOCK_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlockd_SOURCES =3D \ $(LOCK_PROTOCOL_GENERATED) \ $(LOCK_DAEMON_GENERATED) \ $(NULL) diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index dbaac2bb0d..fba54239d5 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -10,7 +10,6 @@ LOG_DAEMON_GENERATED =3D \ $(NULL) =20 LOG_DRIVER_SOURCES =3D \ - $(LOG_PROTOCOL_GENERATED) \ logging/log_manager.c \ logging/log_manager.h \ $(NULL) @@ -30,10 +29,8 @@ LOG_PROTOCOL =3D $(srcdir)/logging/log_protocol.x =20 EXTRA_DIST +=3D \ $(LOG_PROTOCOL) \ - $(LOG_PROTOCOL_GENERATED) \ - $(LOG_DAEMON_GENERATED) \ $(LOG_DAEMON_SOURCES) \ - $(LOG_DRIVER_SOURCES) \ + $(LOG_DRIVER) \ logging/virtlogd.aug \ logging/virtlogd.conf \ logging/test_virtlogd.aug.in \ @@ -42,7 +39,7 @@ BUILT_SOURCES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) @@ -66,6 +63,9 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_driver_log.la libvirt_driver_log_la_SOURCES =3D \ $(LOG_DRIVER_SOURCES) \ $(NULL) +nodist_libvirt_driver_log_la_SOURCES =3D \ + $(LOG_PROTOCOL_GENERATED) \ + $(NULL) libvirt_driver_log_la_CFLAGS =3D \ -I$(builddir)/logging \ -I$(builddir)/rpc \ @@ -80,6 +80,8 @@ man8_MANS +=3D virtlogd.8 =20 virtlogd_SOURCES =3D \ $(LOG_DAEMON_SOURCES) \ + $(NULL) +nodist_virtlogd_SOURCES =3D \ $(LOG_PROTOCOL_GENERATED) \ $(LOG_DAEMON_GENERATED) \ $(NULL) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index cb55dfd1c6..d3a7cbf93b 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -22,8 +22,6 @@ LXC_GENERATED =3D \ LXC_MONITOR_PROTOCOL =3D $(srcdir)/lxc/lxc_monitor_protocol.x =20 LXC_DRIVER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_MONITOR_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -47,8 +45,6 @@ LXC_DRIVER_SOURCES =3D \ $(NULL) =20 LXC_CONTROLLER_SOURCES =3D \ - $(LXC_MONITOR_PROTOCOL_GENERATED) \ - $(LXC_CONTROLLER_GENERATED) \ lxc/lxc_conf.c \ lxc/lxc_conf.h \ lxc/lxc_container.c \ @@ -62,13 +58,17 @@ LXC_CONTROLLER_SOURCES =3D \ lxc/lxc_controller.c \ $(NULL) =20 - -DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) -STATEFUL_DRIVER_SOURCE_FILES +=3D $(LXC_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) \ + $(LXC_DRIVER_SOURCES) EXTRA_DIST +=3D \ $(LXC_DRIVER_SOURCES) \ $(LXC_MONITOR_PROTOCOL) \ - $(LXC_GENERATED) \ $(LXC_CONTROLLER_SOURCES) \ $(NULL) =20 @@ -112,7 +112,11 @@ libvirt_driver_lxc_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) libvirt_driver_lxc_impl_la_LIBADD +=3D $(BLKID_LIBS) endif WITH_BLKID libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) -libvirt_driver_lxc_impl_la_SOURCES =3D $(LXC_DRIVER_SOURCES) +libvirt_driver_lxc_impl_la_SOURCES =3D \ + $(LXC_DRIVER_SOURCES) +nodist_libvirt_driver_lxc_impl_la_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_MONITOR_GENERATED) =20 =20 sbin_PROGRAMS +=3D virtlxcd @@ -123,6 +127,7 @@ augeastest_DATA +=3D lxc/test_virtlxcd.aug CLEANFILES +=3D lxc/virtlxcd.aug =20 virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodst_virtlxcd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtlxcd\"" \ @@ -183,6 +188,10 @@ libvirt_lxc_SOURCES =3D \ $(LXC_CONTROLLER_SOURCES) \ $(DATATYPES_SOURCES) \ $(NULL) +nodist_libvirt_lxc_SOURCES =3D \ + $(LXC_MONITOR_PROTOCOL_GENERATED) \ + $(LXC_CONTROLLER_GENERATED) \ + $(NULL) libvirt_lxc_LDFLAGS =3D \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 2f7932ae60..58dd90c23b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -59,6 +59,7 @@ augeastest_DATA +=3D network/test_virtnetworkd.aug CLEANFILES +=3D network/virtnetworkd.aug =20 virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnetworkd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnetworkd\"" \ diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 1dfa0a5274..2a8c437e7b 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -77,6 +77,7 @@ augeastest_DATA +=3D node_device/test_virtnodedevd.aug CLEANFILES +=3D node_device/virtnodedevd.aug =20 virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnodedevd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnodedevd\"" \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index ca05cba934..c320b75f78 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -60,6 +60,7 @@ augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug CLEANFILES +=3D nwfilter/virtnwfilterd.aug =20 virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtnwfilterd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtnwfilterd\"" \ diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 69e290c428..3f3476b2b4 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -134,6 +134,7 @@ augeastest_DATA +=3D qemu/test_virtqemud.aug CLEANFILES +=3D qemu/virtqemud.aug =20 virtqemud_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtqemud_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtqemud_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtqemud\"" \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 242eb3ed2d..f5de92be23 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -15,7 +15,6 @@ REMOTE_DRIVER_GENERATED =3D \ REMOTE_DRIVER_SOURCES =3D \ remote/remote_driver.c \ remote/remote_driver.h \ - $(REMOTE_DRIVER_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_GENERATED =3D \ @@ -33,7 +32,6 @@ REMOTE_DAEMON_SOURCES =3D \ remote/remote_daemon_dispatch.h \ remote/remote_daemon_stream.c \ remote/remote_daemon_stream.h \ - $(REMOTE_DAEMON_GENERATED) \ $(NULL) =20 REMOTE_DAEMON_CFLAGS =3D \ @@ -140,7 +138,9 @@ REMOTE_DRIVER_PROTOCOL =3D \ $(LXC_PROTOCOL) \ $(NULL) =20 -DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES) +DRIVER_SOURCE_FILES +=3D \ + $(REMOTE_DRIVER_GENERATED) \ + $(REMOTE_DRIVER_SOURCES) =20 EXTRA_DIST +=3D \ $(REMOTE_DRIVER_PROTOCOL) \ @@ -161,11 +161,9 @@ BUILT_SOURCES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ $(NULL) -MAINTAINERCLEANFILES +=3D \ +CLEANFILES +=3D \ $(REMOTE_DRIVER_GENERATED) \ $(REMOTE_DAEMON_GENERATED) \ - $(NULL) -CLEANFILES +=3D \ remote/libvirtd.conf \ remote/virtproxyd.conf \ $(NULL) @@ -182,10 +180,13 @@ libvirt_driver_remote_la_CFLAGS =3D \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) +libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_SOURCES) +nodist_libvirt_driver_remote_la_SOURCES =3D \ + $(REMOTE_DRIVER_GENERATED) =20 if WITH_DTRACE_PROBES -nodist_libvirt_driver_remote_la_SOURCES =3D libvirt_probes.h +nodist_libvirt_driver_remote_la_SOURCES +=3D libvirt_probes.h endif WITH_DTRACE_PROBES =20 if WITH_SASL @@ -230,6 +231,8 @@ man8_MANS +=3D libvirtd.8 =20 libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) =20 +nodist_libvirtd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) + libvirtd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ @@ -243,6 +246,7 @@ libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtproxyd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtproxyd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DSOCK_PREFIX=3D"\"libvirt\"" \ diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 4aa38db1ab..a5bde92c9f 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -16,7 +16,7 @@ VIR_NET_RPC_GENERATED =3D \ $(NULL) =20 BUILT_SOURCES +=3D $(VIR_NET_RPC_GENERATED) -MAINTAINERCLEANFILES +=3D $(VIR_NET_RPC_GENERATED) +CLEANFILES +=3D $(VIR_NET_RPC_GENERATED) =20 noinst_LTLIBRARIES +=3D \ libvirt-net-rpc.la \ @@ -39,6 +39,9 @@ libvirt_net_rpc_la_SOURCES =3D \ rpc/virnetsocket.c \ rpc/virkeepalive.h \ rpc/virkeepalive.c \ + $(NULL) + +nodist_libvirt_net_rpc_la_SOURCES =3D \ $(VIR_NET_RPC_GENERATED) \ $(NULL) =20 diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 94f293d418..3d77366d3c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -48,6 +48,7 @@ augeastest_DATA +=3D secret/test_virtsecretd.aug CLEANFILES +=3D secret/virtsecretd.aug =20 virtsecretd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtsecretd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtsecretd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtsecretd\"" \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index ec35ab7665..1dfe48668f 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -152,6 +152,7 @@ augeastest_DATA +=3D storage/test_virtstoraged.aug CLEANFILES +=3D storage/virtstoraged.aug =20 virtstoraged_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtstoraged_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtstoraged_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtstoraged\"" \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index d8c8e61c4b..0eadef71ca 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -253,9 +253,8 @@ KEYMANS =3D $(KEYPODS:%.pod=3D%.7) =20 man7_MANS +=3D $(KEYMANS) =20 -UTIL_SOURCES +=3D $(KEYTABLES) BUILT_SOURCES +=3D $(KEYTABLES) -MAINTAINERCLEANFILES +=3D $(KEYTABLES) +CLEANFILES +=3D $(KEYTABLES) CLEANFILES +=3D $(KEYMANS) $(KEYPODS) =20 UTIL_IO_HELPER_SOURCES =3D util/iohelper.c @@ -266,6 +265,9 @@ libvirt_la_BUILT_LIBADD +=3D libvirt_util.la libvirt_util_la_SOURCES =3D \ $(UTIL_SOURCES) \ $(NULL) +nodist_libvirt_util_la_SOURCES =3D \ + $(KEYTABLES) \ + $(NULL) libvirt_util_la_CFLAGS =3D \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 346a84429b..551189c0f5 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -73,6 +73,7 @@ augeastest_DATA +=3D vbox/test_virtvboxd.aug CLEANFILES +=3D vbox/virtvboxd.aug =20 virtvboxd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtvboxd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtvboxd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvboxd\"" \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index c5bef04088..1757c8ba10 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -47,6 +47,7 @@ augeastest_DATA +=3D vz/test_virtvzd.aug CLEANFILES +=3D vz/virtvzd.aug =20 virtvzd_SOURCES =3D $(REMOTE_DAEMON_SOURCES) +nodist_virtvzd_SOURCES =3D $(REMOTE_DAEMON_GENERATED) virtvzd_CFLAGS =3D \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME=3D"\"virtvzd\"" \ --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list