[libvirt] [PATCH 2/3] build: Kill docs/schemas/Makefile.am
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
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
## <http://www.gnu.org/licenses/>;.
-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
-## <http://www.gnu.org/licenses/>;.
-
-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)
--
2.5.0