openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: Kill docs/schemas/Makefile.am 

Move the logic to docs/Makefile.am, and simplify it with a wildcard
expression.
This commit is contained in:
Cole Robinson 2016-01-10 15:14:33 -05:00
parent 48b6ca8302
commit f7d0f12407
3 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2796,7 +2796,6 @@ AC_CONFIG_FILES([run],
[chmod +x,-w run]) [chmod +x,-w run])
AC_CONFIG_FILES([\ AC_CONFIG_FILES([\
Makefile src/Makefile include/Makefile docs/Makefile \ Makefile src/Makefile include/Makefile docs/Makefile \
docs/schemas/Makefile \
gnulib/lib/Makefile \ gnulib/lib/Makefile \
gnulib/tests/Makefile \ gnulib/tests/Makefile \
libvirt.pc \ libvirt.pc \

10
docs/Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## 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 ## This library is free software; you can redistribute it and/or
## modify it under the terms of the GNU Lesser General Public ## modify it under the terms of the GNU Lesser General Public
@ -16,8 +16,6 @@
## License along with this library. If not, see ## License along with this library. If not, see
## <http://www.gnu.org/licenses/>. ## <http://www.gnu.org/licenses/>.
SUBDIRS= schemas
PERL = perl PERL = perl
# The directory containing the source code (if it contains documentation). # The directory containing the source code (if it contains documentation).
@ -150,6 +148,9 @@ fig = \
migration-tunnel.fig \ migration-tunnel.fig \
migration-unmanaged-direct.fig migration-unmanaged-direct.fig
schemadir = $(pkgdatadir)/schemas
schema_DATA = $(wildcard schemas/*.rng)
EXTRA_DIST= \ EXTRA_DIST= \
apibuild.py genaclperms.pl \ apibuild.py genaclperms.pl \
site.xsl newapi.xsl news.xsl page.xsl \ site.xsl newapi.xsl news.xsl page.xsl \
@ -160,7 +161,8 @@ EXTRA_DIST= \
$(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
$(internals_html_in) $(internals_html) \ $(internals_html_in) $(internals_html) \
sitemap.html.in aclperms.htmlinc \ 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 acl_generated = aclperms.htmlinc

35
docs/schemas/Makefile.am
View File

@ -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)