External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add include directory

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-06-18 00:53:35 +02:00
parent 116f94913f
commit 6639943b23
6 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -20,7 +20,7 @@
# so force it explicitly # so force it explicitly
DISTCHECK_CONFIGURE_FLAGS = --enable-werror DISTCHECK_CONFIGURE_FLAGS = --enable-werror
SUBDIRS = . include/libvirt src tools docs \ SUBDIRS = . src tools docs \
tests po examples tests po examples
XZ_OPT ?= -v -T0 XZ_OPT ?= -v -T0

3
configure.ac
View File

@ -687,7 +687,7 @@ m4_if(m4_version_compare([2.61a.100],
AC_CONFIG_FILES([run], AC_CONFIG_FILES([run],
[chmod +x,-w run]) [chmod +x,-w run])
AC_CONFIG_FILES([\ AC_CONFIG_FILES([\
Makefile src/Makefile include/libvirt/Makefile docs/Makefile \ Makefile src/Makefile docs/Makefile \
.color_coded \ .color_coded \
.ycm_extra_conf.py \ .ycm_extra_conf.py \
libvirt.pc \ libvirt.pc \
@ -699,7 +699,6 @@ AC_CONFIG_FILES([\
src/libvirt-lxc.pc \ src/libvirt-lxc.pc \
libvirt.spec mingw-libvirt.spec \ libvirt.spec mingw-libvirt.spec \
po/Makefile \ po/Makefile \
include/libvirt/libvirt-common.h \
examples/Makefile \ examples/Makefile \
tests/Makefile \ tests/Makefile \
tools/Makefile]) tools/Makefile])

26
include/libvirt/Makefile.am
View File

@ -1,26 +0,0 @@
## Process this file with automake to produce Makefile.in
## 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
## 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/>.
virincdir = $(includedir)/libvirt
allheaders = $(wildcard $(srcdir)/*.h)
virinc_HEADERS = $(filter-out $(srcdir)/libvirt-common.h, $(allheaders))
nodist_virinc_HEADERS = libvirt-common.h
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(virincdir)

36
include/libvirt/meson.build Normal file
View File

@ -0,0 +1,36 @@
libvirt_common_h_in = files('libvirt-common.h.in')
libvirt_include = files(
'libvirt-admin.h',
'libvirt-domain-checkpoint.h',
'libvirt-domain.h',
'libvirt-domain-snapshot.h',
'libvirt-event.h',
'libvirt.h',
'libvirt-host.h',
'libvirt-interface.h',
'libvirt-lxc.h',
'libvirt-network.h',
'libvirt-nodedev.h',
'libvirt-nwfilter.h',
'libvirt-qemu.h',
'libvirt-secret.h',
'libvirt-storage.h',
'libvirt-stream.h',
'virterror.h',
)
include_conf = configuration_data()
include_conf.merge_from(conf)
libvirt_common_h = configure_file(
input: libvirt_common_h_in,
output: 'libvirt-common.h',
configuration: include_conf,
)
install_headers(
libvirt_include,
libvirt_common_h,
install_dir: includedir / 'libvirt',
)

3
include/meson.build Normal file
View File

@ -0,0 +1,3 @@
libvirt_inc = include_directories('.')
subdir('libvirt')

2
meson.build
View File

@ -639,6 +639,8 @@ top_inc_dir = include_directories('.')
subdir('scripts') subdir('scripts')
subdir('include')
# generate meson-config.h file # generate meson-config.h file
configure_file(output: 'meson-config.h', configuration: conf) configure_file(output: 'meson-config.h', configuration: conf)