From nobody Sat Apr 20 08:33:39 2024 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=1557752126; cv=none; d=zoho.com; s=zohoarc; b=NjHi72/w4KvCwGfehthbP3duczRNqLNmc/7i4Jx6ek50eqfth0PDItnKt/wDafVPJ4OvXOG0S8Eq8CYHzQjcGggPMfNVWpmEGj6mLTBsJ/K4sNQ5ngFZrI/jjpQHkLji72VJljywA1M3Y8WOxLW93/+GfoMjZPkmYiZhj7EW15Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557752126; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=1Io3ZWIkiPlIxzDSCNn/2ff7ogKt9Z7rzuPlKmvSHN4=; b=e0IC5xUji0gAiY4HZ5QCpJlfCvAi14jwWiItfDXFI3h3sne0zmmpmMAMwIzL6RXt49f15T66fCYydzvvJ7ixd2z3NNE1kkV5n9hjCz+bGYSox/yRacZ7dPfo7qLtsZDaxQNZE7baRwMl5k5U6KHZfOKzTUPfXw71H9axPl8sokc= 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 155775212686340.29270830473388; Mon, 13 May 2019 05:55:26 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 94161309264D; Mon, 13 May 2019 12:55:23 +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 AF75C5D71F; Mon, 13 May 2019 12:55:22 +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 F392818089CB; Mon, 13 May 2019 12:55:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4DCtIYc011247 for ; Mon, 13 May 2019 08:55:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id A90615D706; Mon, 13 May 2019 12:55:18 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 318805D720 for ; Mon, 13 May 2019 12:55:15 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 13 May 2019 14:55:14 +0200 Message-Id: <20190513125514.21222-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] examples: Fix installation on Windows 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-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 13 May 2019 12:55:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We can't rely on $(noinst_PROGRAMS) retaining its original value, so let's use a separate $(EXAMPLES) variable instead. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- examples/Makefile.am | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index c7688c7c3d..11c9f44917 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -34,11 +34,32 @@ LDADD =3D $(STATIC_BINARIES) $(WARN_CFLAGS) \ $(top_builddir)/src/libvirt.la \ $(top_builddir)/src/libvirt-admin.la =20 -noinst_PROGRAMS=3Ddominfo/info1 dommigrate/dommigrate domsuspend/suspend \ - domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \ - openauth/openauth rename/rename admin/list_servers admin/list_clients \ - admin/threadpool_params admin/client_limits admin/client_info \ - admin/client_close admin/logging +# List of example programs. We need to list them here instead of using +# $(noinst_PROGRAMS) directly because we want to have access to the +# unmodified list during (un)installation, but at the same time automake +# might tweak $(noinst_PROGRAMS) to eg. automatically add the .exe file +# extension when targeting Windows. +EXAMPLES =3D \ + admin/client_close \ + admin/client_info \ + admin/client_limits \ + admin/list_clients \ + admin/list_servers \ + admin/logging \ + admin/threadpool_params \ + dominfo/info1 \ + dommigrate/dommigrate \ + domsuspend/suspend \ + domtop/domtop \ + hellolibvirt/hellolibvirt \ + object-events/event-test \ + openauth/openauth \ + rename/rename \ + $(NULL) + +noinst_PROGRAMS =3D \ + $(EXAMPLES) \ + $(NULL) =20 dominfo_info1_SOURCES =3D dominfo/info1.c dommigrate_dommigrate_SOURCES =3D dommigrate/dommigrate.c @@ -88,13 +109,13 @@ examplesdir =3D $(docdir)/examples =20 install-data-local: $(INSTALL_DATA_LOCAL) $(mkinstalldirs) $(DESTDIR)$(examplesdir) - for p in $(noinst_PROGRAMS); do \ + for p in $(EXAMPLES); do \ d=3D$$(dirname $$p); \ $(mkinstalldirs) $(DESTDIR)$(examplesdir)/$$d; \ $(INSTALL_DATA) $(srcdir)/$${p}.c $(DESTDIR)$(examplesdir)/$$d/; \ done =20 uninstall-local: $(UNINSTALL_LOCAL) - for p in $(noinst_PROGRAMS); do \ + for p in $(EXAMPLES); do \ rm -f $(DESTDIR)$(examplesdir)/$${p}.c; \ done --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list