[Pkg-bitcoin-commits] [libunivalue] 47/76: build: don't use a SUBDIR for the test build

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository libunivalue.

commit 650213418415efa536bff7216a000d654826a249
Author: Cory Fields <cory-nospam- at coryfields.com>
Date:   Thu Sep 24 14:45:40 2015 -0400

    build: don't use a SUBDIR for the test build
---
 Makefile.am      | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac     |  1 -
 test/Makefile.am | 48 ------------------------------------------------
 3 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b11ca18..8419ef6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,55 @@ lib_libunivalue_la_LDFLAGS = \
 	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
 	-no-undefined
 
-noinst_PROGRAMS = lib/gen
+TESTS = test/unitester
+
+noinst_PROGRAMS = lib/gen $(TESTS)
 
 lib_gen_SOURCES = lib/gen.cpp
 
-SUBDIRS = . test
+TEST_DATA_DIR=test
+
+test_unitester_SOURCES = test/unitester.cpp
+test_unitester_LDADD = lib/libunivalue.la
+test_unitester_CXXFLAGS = -I$(top_srcdir)/lib -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
+
+TEST_FILES = \
+	$(TEST_DATA_DIR)/fail10.json \
+	$(TEST_DATA_DIR)/fail11.json \
+	$(TEST_DATA_DIR)/fail12.json \
+	$(TEST_DATA_DIR)/fail13.json \
+	$(TEST_DATA_DIR)/fail14.json \
+	$(TEST_DATA_DIR)/fail15.json \
+	$(TEST_DATA_DIR)/fail16.json \
+	$(TEST_DATA_DIR)/fail17.json \
+	$(TEST_DATA_DIR)/fail18.json \
+	$(TEST_DATA_DIR)/fail19.json \
+	$(TEST_DATA_DIR)/fail1.json \
+	$(TEST_DATA_DIR)/fail20.json \
+	$(TEST_DATA_DIR)/fail21.json \
+	$(TEST_DATA_DIR)/fail22.json \
+	$(TEST_DATA_DIR)/fail23.json \
+	$(TEST_DATA_DIR)/fail24.json \
+	$(TEST_DATA_DIR)/fail25.json \
+	$(TEST_DATA_DIR)/fail26.json \
+	$(TEST_DATA_DIR)/fail27.json \
+	$(TEST_DATA_DIR)/fail28.json \
+	$(TEST_DATA_DIR)/fail29.json \
+	$(TEST_DATA_DIR)/fail2.json \
+	$(TEST_DATA_DIR)/fail30.json \
+	$(TEST_DATA_DIR)/fail31.json \
+	$(TEST_DATA_DIR)/fail32.json \
+	$(TEST_DATA_DIR)/fail33.json \
+	$(TEST_DATA_DIR)/fail34.json \
+	$(TEST_DATA_DIR)/fail3.json \
+	$(TEST_DATA_DIR)/fail4.json \
+	$(TEST_DATA_DIR)/fail5.json \
+	$(TEST_DATA_DIR)/fail6.json \
+	$(TEST_DATA_DIR)/fail7.json \
+	$(TEST_DATA_DIR)/fail8.json \
+	$(TEST_DATA_DIR)/fail9.json \
+	$(TEST_DATA_DIR)/pass1.json \
+	$(TEST_DATA_DIR)/pass2.json \
+	$(TEST_DATA_DIR)/pass3.json
 
+EXTRA_DIST=$(TEST_FILES)
diff --git a/configure.ac b/configure.ac
index 24af5ca..9c423f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ LT_INIT
 LT_LANG([C++])
 
 AC_CONFIG_FILES([
-    test/Makefile
     Makefile
     lib/libunivalue.pc
     lib/libunivalue-uninstalled.pc])
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 8896975..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-TESTS = unitester
-
-noinst_PROGRAMS = unitester
-
-unitester_SOURCES = unitester.cpp
-unitester_LDADD = ../lib/libunivalue.la
-unitester_CXXFLAGS = -I$(top_srcdir)/lib -DJSON_TEST_SRC=\"$(top_srcdir)/test\"
-
-EXTRA_DIST = \
-	fail10.json \
-	fail11.json \
-	fail12.json \
-	fail13.json \
-	fail14.json \
-	fail15.json \
-	fail16.json \
-	fail17.json \
-	fail18.json \
-	fail19.json \
-	fail1.json \
-	fail20.json \
-	fail21.json \
-	fail22.json \
-	fail23.json \
-	fail24.json \
-	fail25.json \
-	fail26.json \
-	fail27.json \
-	fail28.json \
-	fail29.json \
-	fail2.json \
-	fail30.json \
-	fail31.json \
-	fail32.json \
-	fail33.json \
-	fail34.json \
-	fail3.json \
-	fail4.json \
-	fail5.json \
-	fail6.json \
-	fail7.json \
-	fail8.json \
-	fail9.json \
-	pass1.json \
-	pass2.json \
-	pass3.json
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git