From patchwork Sun Jan 10 23:06:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 59442 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1786921lbb; Sun, 10 Jan 2016 15:09:48 -0800 (PST) X-Received: by 10.194.113.227 with SMTP id jb3mr3553958wjb.49.1452467388889; Sun, 10 Jan 2016 15:09:48 -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 z123si18452947wmz.95.2016.01.10.15.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jan 2016 15:09:48 -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 u0AN7TZa008505; Sun, 10 Jan 2016 18:07:29 -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 u0AN6SBQ023103 for ; Sun, 10 Jan 2016 18:06:28 -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 u0AN6QIT001074; Sun, 10 Jan 2016 18:06:27 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Sun, 10 Jan 2016 18:06:22 -0500 Message-Id: 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 2/3] build: Kill docs/schemas/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 the logic to docs/Makefile.am, and simplify it with a wildcard expression. --- configure.ac | 1 - docs/Makefile.am | 10 ++++++---- docs/schemas/Makefile.am | 35 ----------------------------------- 3 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 docs/schemas/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 787d0c6..58807a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2796,7 +2796,6 @@ AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ Makefile src/Makefile include/Makefile docs/Makefile \ - docs/schemas/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ libvirt.pc \ diff --git a/docs/Makefile.am b/docs/Makefile.am index 13d7a5f..5f531ea 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2015 Red Hat, Inc. +## Copyright (C) 2005-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,8 +16,6 @@ ## License along with this library. If not, see ## . -SUBDIRS= schemas - PERL = perl # The directory containing the source code (if it contains documentation). @@ -150,6 +148,9 @@ fig = \ migration-tunnel.fig \ migration-unmanaged-direct.fig +schemadir = $(pkgdatadir)/schemas +schema_DATA = $(wildcard schemas/*.rng) + EXTRA_DIST= \ apibuild.py genaclperms.pl \ site.xsl newapi.xsl news.xsl page.xsl \ @@ -160,7 +161,8 @@ EXTRA_DIST= \ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(internals_html_in) $(internals_html) \ sitemap.html.in aclperms.htmlinc \ - todo.pl hvsupport.pl todo.cfg-example + todo.pl hvsupport.pl todo.cfg-example \ + $(schema_DATA) acl_generated = aclperms.htmlinc diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am deleted file mode 100644 index 0e14dc6..0000000 --- a/docs/schemas/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -## Copyright (C) 2005-2011, 2013-2014 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 -## . - -schemadir = $(pkgdatadir)/schemas -schema_DATA = \ - basictypes.rng \ - capability.rng \ - domain.rng \ - domaincaps.rng \ - domaincommon.rng \ - domainsnapshot.rng \ - interface.rng \ - network.rng \ - networkcommon.rng \ - nodedev.rng \ - nwfilter.rng \ - secret.rng \ - storagecommon.rng \ - storagepool.rng \ - storagevol.rng - -EXTRA_DIST = $(schema_DATA)