From patchwork Sun Jan 10 23:06:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 59443 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1786926lbb; Sun, 10 Jan 2016 15:09:49 -0800 (PST) X-Received: by 10.194.86.71 with SMTP id n7mr125121856wjz.107.1452467389104; Sun, 10 Jan 2016 15:09:49 -0800 (PST) Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com. [209.132.183.37]) by mx.google.com with ESMTPS id as5si6801598wjc.15.2016.01.10.15.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2016 15:09:49 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0AN7H4h008464; Sun, 10 Jan 2016 18:07:18 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u0AN6RQo023092 for ; Sun, 10 Jan 2016 18:06:27 -0500 Received: from colepc.redhat.com (ovpn-113-33.phx2.redhat.com [10.3.113.33]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0AN6QIS001074; Sun, 10 Jan 2016 18:06:27 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Sun, 10 Jan 2016 18:06:21 -0500 Message-Id: <69e590fd8c02c46287bbf4a863b47cd52c0e418a.1452466410.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] build: Kill include/libvirt/Makefile.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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com Move all the logic to include/Makefile.am, simplify it with a wildcard, then kill include/libvirt/Makefile.am --- configure.ac | 2 +- include/Makefile.am | 19 +++++++++++++++++-- include/libvirt/Makefile.am | 44 -------------------------------------------- 3 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 include/libvirt/Makefile.am -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/configure.ac b/configure.ac index a46f9b3..787d0c6 100644 --- a/configure.ac +++ b/configure.ac @@ -2808,7 +2808,7 @@ AC_CONFIG_FILES([\ src/libvirt-lxc.pc \ libvirt.spec mingw-libvirt.spec \ po/Makefile.in \ - include/libvirt/Makefile include/libvirt/libvirt-common.h \ + include/libvirt/libvirt-common.h \ daemon/Makefile \ examples/Makefile \ tests/Makefile \ diff --git a/include/Makefile.am b/include/Makefile.am index 80361a7..1805700 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2011, 2013 Red Hat, Inc. +## Copyright (C) 2005-2011, 2013-2016 Red Hat, Inc. ## ## This library is free software; you can redistribute it and/or ## modify it under the terms of the GNU Lesser General Public @@ -16,4 +16,19 @@ ## License along with this library. If not, see ## . -SUBDIRS=libvirt +virincdir = $(includedir)/libvirt + +allheaders = $(wildcard libvirt/*.h) +virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders)) + +EXTRA_DIST = libvirt/libvirt-common.h.in + +# Temporarily disabled, but we need it for building +EXTRA_DIST += libvirt/libvirt-admin.h + +all: + echo $(EXTRA_DIST) + echo $(virinc_HEADERS) + +install-exec-hook: + $(mkinstalldirs) $(DESTDIR)$(virincdir) diff --git a/include/libvirt/Makefile.am b/include/libvirt/Makefile.am deleted file mode 100644 index 5a4ada0..0000000 --- a/include/libvirt/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2005-2011, 2013-2015 Red Hat, Inc. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## . - -virincdir = $(includedir)/libvirt - -virinc_HEADERS = libvirt.h \ - libvirt-common.h \ - libvirt-domain.h \ - libvirt-domain-snapshot.h \ - libvirt-event.h \ - libvirt-host.h \ - libvirt-interface.h \ - libvirt-network.h \ - libvirt-nodedev.h \ - libvirt-nwfilter.h \ - libvirt-secret.h \ - libvirt-storage.h \ - libvirt-stream.h \ - libvirt-lxc.h \ - libvirt-qemu.h \ - virterror.h - -install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(virincdir) - -EXTRA_DIST = libvirt-common.h.in - -# Temporarily disabled, but we need it for building -EXTRA_DIST += libvirt-admin.h