build: avoid non-srcdir "make distcheck" failures (srcdir vs wildcard)

* tests/xencapsdata/Makefile.am: Use $(wildcard in $(srcdir)-aware manner
* tests/xmconfigdata/Makefile.am: Likewise.
* tests/xml2sexprdata/Makefile.am: Likewise.
* tests/sexpr2xmldata/Makefile.am (EXTRA_DIST): Likewise.
* Makefile.am (XML_EXAMPLES): Use $(wildcard in $(srcdir)-aware manner.

diff --git a/Makefile.am b/Makefile.am
index a02cd26181c4796462de6a2baf02a6c92613e7eb..09439c8346189f461e6b8ca193d6309ab73ef2f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,9 @@ SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
-XML_EXAMPLES = $(wildcard examples/xml/test/*.xml) $(wildcard examples/xml/storage/*.xml)
+XML_EXAMPLES = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \
+                                       test/*.xml storage/*.xml)))
 
 EXTRA_DIST = \
   ChangeLog-old \

diff --git a/tests/sexpr2xmldata/Makefile.am b/tests/sexpr2xmldata/Makefile.am
index 43117d5cb939273e0450b3f60cc225f719df2e4e..db43109ddfcc05a2ba41bdd9b7b7dedb00edb2a1 100644 (file)
--- a/tests/sexpr2xmldata/Makefile.am
+++ b/tests/sexpr2xmldata/Makefile.am
@@ -1,2 +1,2 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.sexpr)
+EXTRA_DIST = \
+   $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))

diff --git a/tests/xencapsdata/Makefile.am b/tests/xencapsdata/Makefile.am
index 7d775758f51a683491187510d41656c4f70cd750..ed08bc421b7a742658af348116ed8e567541d1c2 100644 (file)
--- a/tests/xencapsdata/Makefile.am
+++ b/tests/xencapsdata/Makefile.am
@@ -1,2 +1,3 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cpuinfo) $(wildcard *.caps)
+EXTRA_DIST = \
+  $(patsubst $(srcdir)/%,%,$(wildcard \
+    $(srcdir)/*.xml $(srcdir)/*.cpuinfo $(srcdir)/*.caps))

diff --git a/tests/xmconfigdata/Makefile.am b/tests/xmconfigdata/Makefile.am
index 05201a087bb1a36d1cf6a44935ae6c16c86379cc..af0cb0917f4dacb96dd797b95261b877be6724dd 100644 (file)
--- a/tests/xmconfigdata/Makefile.am
+++ b/tests/xmconfigdata/Makefile.am
@@ -1,2 +1,2 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.cfg)
+EXTRA_DIST = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.cfg))

diff --git a/tests/xml2sexprdata/Makefile.am b/tests/xml2sexprdata/Makefile.am
index 43117d5cb939273e0450b3f60cc225f719df2e4e..20028bbb210f41cb84c039210bdbde4e4a8d2cc4 100644 (file)
--- a/tests/xml2sexprdata/Makefile.am
+++ b/tests/xml2sexprdata/Makefile.am
@@ -1,2 +1,2 @@
-
-EXTRA_DIST = $(wildcard *.xml) $(wildcard *.sexpr)
+EXTRA_DIST = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/*.xml $(srcdir)/*.sexpr))