[med-svn] [libgtextutils] 49/83: Fix 'make distcheck'

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch debian/unstable
in repository libgtextutils.

commit 4ae8713a1a6b95c80c70ef919247aca9a5e9d10f
Author: Assaf Gordon <assafgordon at gmail.com>
Date:   Sun Nov 3 23:37:07 2013 +0200

    Fix 'make distcheck'
---
 .gitignore        | 23 +++++++++++++++++++++++
 Makefile.am       |  6 ++++++
 tests/Makefile.am |  9 +++++----
 tests/test.txt    |  4 ----
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d84460..a0f8554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ src/gtextutils/.libs/
 src/gtextutils/*.o
 src/gtextutils/*.la
 src/gtextutils/*.lo
+tests/*.o
+tests/*.trs
+tests/*.log
 
 aclocal.m4
 autom4te.cache/*
@@ -28,3 +31,23 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 stamp-h1
+
+libgtextutils-*.tar.bz2
+libgtextutils-*.tar.gz
+
+tests/.libs
+
+tests/fdout.txt.gz
+tests/pipe_out.txt.gz
+
+tests/test_container_join
+tests/test_fd_inbuf
+tests/test_fd_outbuf
+tests/test_in_out_buf
+tests/test_input_stream_wrapper
+tests/test_natural_sort
+tests/test_pipe_fitter
+tests/test_string_tokenize
+tests/test_text_reader
+tests/test_text_reader_unget
+
diff --git a/Makefile.am b/Makefile.am
index e9fc73a..14d1a80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,3 +15,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gtextutils.pc
+
+distcleancheck_listfiles=\
+			./tests/test.txt \
+			./tests/fdout.txt.gz \
+			./tests/pipe_out.txt.gz
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b783c9..149b3b7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,9 +9,6 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 
-EXTRA_DIST = test.txt
-noinst_DATA = test.txt
-
 if TUPLE_PARSER_CHECK
 TUPLE_PROG = test_tuple_parser \
 	     test_tuple_parser_file
@@ -19,6 +16,10 @@ else
 TUPLE_PROG = 
 endif
 
+AM_TESTS_ENVIRONMENT=\
+	printf "first line\nsecond line\nthird line\nfourth line\n" > test.txt;
+
+
 check_PROGRAMS = test_container_join \
 		 test_natural_sort \
 		 test_input_stream_wrapper \
@@ -33,7 +34,7 @@ check_PROGRAMS = test_container_join \
 
 TESTS = $(check_PROGRAMS)
 
-LDADD = $(top_srcdir)/src/gtextutils/libgtextutils.la
+LDADD = $(top_builddir)/src/gtextutils/libgtextutils.la
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
 test_container_join_SOURCES = test_container_join.cpp tests_assertion.h
diff --git a/tests/test.txt b/tests/test.txt
deleted file mode 100644
index 7a4a73a..0000000
--- a/tests/test.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-first line
-second line
-third line
-fourth line

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libgtextutils.git