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

build: Kill include/libvirt/Makefile.am

Browse Source 
Move all the logic to include/Makefile.am, simplify it with a wildcard,
then kill include/libvirt/Makefile.am
This commit is contained in:
Cole Robinson 2016-01-10 14:36:13 -05:00
parent 4f47778591
commit 48b6ca8302
3 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2808,7 +2808,7 @@ AC_CONFIG_FILES([\
src/libvirt-lxc.pc \ src/libvirt-lxc.pc \
libvirt.spec mingw-libvirt.spec \ libvirt.spec mingw-libvirt.spec \
po/Makefile.in \ po/Makefile.in \
include/libvirt/Makefile include/libvirt/libvirt-common.h \ include/libvirt/libvirt-common.h \
daemon/Makefile \ daemon/Makefile \
examples/Makefile \ examples/Makefile \
tests/Makefile \ tests/Makefile \

15
include/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-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 ## 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,4 +16,15 @@
## 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=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
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(virincdir)

44
include/libvirt/Makefile.am
View File

@ -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
## <http://www.gnu.org/licenses/>.
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