From c1348bba1462be9dd93c5d12328473c1dc87889d Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 16 Jan 2013 12:51:24 +0100
Subject: dist: use autom4te to distribute test files

---
 Makefile.am       | 11 +++++++++++
 configure.ac      |  1 -
 tests/Makefile.am |  2 --
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f8dd3cc..5071300 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,6 +113,17 @@ installcheck-local: $(srcdir)/tests/testsuite atconfig atlocal
 clean-local:
 	-$(SHELL) $(srcdir)/tests/testsuite --clean
 
+dist-hook:
+	@for file in `cd $(srcdir)/tests && \
+		$(AUTOM4TE) --language=autotest --trace='AT_MSIDATA:tests/data/$$1' \
+			    testsuite.at`; do \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    $(MKDIR_P) "$(distdir)$$dir" || exit 1; \
+	    echo cp -fpR $(srcdir)/$$file "$(distdir)$$dir"; \
+	    cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	done
+
+
 $(srcdir)/tests/testsuite: tests/testsuite.at tests/wixl.at tests/package.m4
 	cd $(srcdir)/tests && \
 		$(AUTOM4TE) --language=autotest -o testsuite.tmp testsuite.at && \
diff --git a/configure.ac b/configure.ac
index 89cd339..b202290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,6 @@ AC_CONFIG_FILES([
     libmsi/Makefile
     libmsi/libmsi-1.0.pc
     tests/Makefile
-    tests/data/Makefile
 ])
 AC_OUTPUT
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 830eef8..cced9d6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = data
-
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. \
 	      $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 
-- 
cgit