External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand $(wildcard) correctly

Browse Source 
So after da176bf6b7 and friend we have switched to $(wildcard
some/path/*.xml) instead of enumerating the files explicitly.
This is nice, however it makes distcheck build from VPATH fail.
The reason is that it's is not obvious to what does the wildcard
refer to: srcdir or builddir?

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-01-12 16:22:24 +01:00
parent 981c01d419
commit 8c67ab6684
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Makefile.am
View File

@ -149,7 +149,7 @@ fig = \
migration-unmanaged-direct.fig
schemadir = $(pkgdatadir)/schemas
schema_DATA = $(wildcard schemas/*.rng)
schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
EXTRA_DIST= \
apibuild.py genaclperms.pl \

6
examples/Makefile.am
View File

@ -16,7 +16,7 @@
## License along with this library. If not, see
## <http://www.gnu.org/licenses/>.
FILTERS = $(wildcard xml/nwfilter/*.xml)
FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml)
EXTRA_DIST = \
apparmor/TEMPLATE.qemu \
@ -30,8 +30,8 @@ EXTRA_DIST = \
systemtap/events.stp \
systemtap/rpc-monitor.stp \
$(FILTERS) \
$(wildcard xml/storage/*.xml) \
$(wildcard xml/test/*.xml)
$(wildcard $(srcdir)/xml/storage/*.xml) \
$(wildcard $(srcdir)/xml/test/*.xml)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \

4
include/Makefile.am
View File

@ -18,8 +18,8 @@
virincdir = $(includedir)/libvirt
allheaders = $(wildcard libvirt/*.h)
virinc_HEADERS = $(filter-out libvirt/libvirt-admin.h, $(allheaders))
allheaders = $(wildcard $(srcdir)/libvirt/*.h)
virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders))
EXTRA_DIST = libvirt/libvirt-common.h.in