[gxml] * distcheck: make sure that the test*xml files are available to the test program



commit fb456d963b656d935d80ca682ee3eece38362ed2
Author: Richard Schwarting <aquarichy gmail com>
Date:   Wed Aug 22 20:04:47 2012 -0400

    * distcheck: make sure that the test*xml files are available to the test program

 test/Makefile.am |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/test/Makefile.am b/test/Makefile.am
index a282613..83eeaaa 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,7 +15,8 @@ AM_CFLAGS = \
 	$(GXML_CFLAGS) \
 	$(GEE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	-I$(srcdir)/gxml \
+	-I$(top_srcdir) \
+	-DTEST_DIR=\""$(top_srcdir)/test"\" \
 	$(NULL)
 
 VALAC=valac
@@ -44,6 +45,7 @@ gxml_test_VALAFLAGS = \
 	$(AM_VALAFLAGS) \
 	$(ERROR_VALAFLAGS) \
 	$(top_srcdir)/vapi/config.vapi \
+	$(top_srcdir)/vapi/gxml-test.vapi \
 	--vapidir=$(top_srcdir)/vapi \
 	--vapidir=$(top_srcdir)/gxml \
 	--pkg gio-2.0 \
@@ -51,6 +53,7 @@ gxml_test_VALAFLAGS = \
 	--pkg posix \
 	--pkg gxml \
 	--pkg libxml-2.0 \
+	-X -DTEST_DIR=$(top_srcdir)/test \
 	$(NULL)
 
 gxml_test_LDADD = \
@@ -70,11 +73,9 @@ gxml_test_LDFLAGS = $(AM_LDFLAGS)
 
 #...
 
-BUILT_SOURCES = gxml_test.vala.stamp
-
-CLEANFILES =  $(BUILT_SOURCES) gxml_test
+testdir = $(top_builddir)/test
 
-EXTRA_DIST += \
+test_DATA = \
 	test_out_path_expected.xml \
 	test_out_path.xml \
 	test_out_stream_expected.xml \
@@ -82,3 +83,11 @@ EXTRA_DIST += \
 	test.xml \
 	$(NULL)
 
+BUILT_SOURCES = gxml_test.vala.stamp
+
+CLEANFILES =  $(BUILT_SOURCES) gxml_test
+
+EXTRA_DIST += \
+	$(test_DATA) \
+	$(NULL)
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]