Expand $(wildcard) correctly

So after da176bf6b756 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>

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5f531ea33631358bc48209df8001d159c89ac19b..fb53a45cbd19dfb08743dd3071245b28a7aa53a7 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -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 \

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 50fc0118851d1977038f44787f3ae1e6fafd5b68..2adcefb39e7903dbb8b56b1633ffb6ee301bc398 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -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) \

diff --git a/include/Makefile.am b/include/Makefile.am
index b3d2bff05ab454197ef76e421938c52e638ceef9..d6269632a5dbe2e65dfae50729496e23a92a15a3 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -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