From d5bf95c5cb11c83233e75dde5edff29a7a6db20c Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 3 Feb 2016 22:08:02 +0100
Subject: [PATCH] do not build ikwiad, randtgba, and modelcheck by default

Fix #128.

* tests/Makefile.am: Make these check_PROGRAMS.
* bench/emptchk/Makefile.am: Adjust.
* bench/emptchk/README, bench/emptchk/defs.in: Fix paths.
---
 bench/emptchk/Makefile.am | 11 +++++++++++
 bench/emptchk/README      |  6 +++---
 bench/emptchk/defs.in     |  4 ++--
 tests/Makefile.am         |  8 +++-----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/bench/emptchk/Makefile.am b/bench/emptchk/Makefile.am
index 6110f9c31..ea5c10125 100644
--- a/bench/emptchk/Makefile.am
+++ b/bench/emptchk/Makefile.am
@@ -20,6 +20,17 @@
 
 PML2TGBA = $(PERL) $(srcdir)/pml2tgba.pl
 
+all-local: $(top_builddir)/tests/core/ikwiad$(EXEEXT) \
+  $(top_builddir)/tests/core/randtgba$(EXEEXT)
+
+$(top_builddir)/tests/core/ikwiad$(EXEEXT):
+	cd $(top_builddir)/tests/ && \
+	$(MAKE) $(AM_MAKEFLAGS) core/ikwiad$(EXEEXT)
+
+$(top_builddir)/tests/core/randtgba$(EXEEXT):
+	cd $(top_builddir)/tests/ && \
+	$(MAKE) $(AM_MAKEFLAGS) core/randtgba$(EXEEXT)
+
 noinst_SCRIPTS = defs
 dist_noinst_SCRIPTS = \
   pml2tgba.pl \
diff --git a/bench/emptchk/README b/bench/emptchk/README
index 03282890f..cad5c2347 100644
--- a/bench/emptchk/README
+++ b/bench/emptchk/README
@@ -264,7 +264,7 @@ This directory contains:
  MORE STATISTICS
 =================
 
-  The ltl-*.sh tests use src/tgbatest/randtgba to output statistics,
+  The ltl-*.sh tests use spot/tests/randtgba to output statistics,
   but randtgba is able to output a lot more data than what we have
   shown above.  Try removing the `-1' option from the script, or toying
   with randtgba itself.
@@ -275,5 +275,5 @@ This directory contains:
   (The `bsh=' argument gives the hash table size in bytes; see also
   http://spot.lip6.fr/wiki/EmptinessCheckOptions)
 
-  Besides randtgba, two other tools that you might find handy we
-  experimenting are src/bin/randltl and src/tests/ikwiad.
+  Besides randtgba, two other tools that you might find handy when
+  experimenting are bin/randltl and tests/core/ikwiad.
diff --git a/bench/emptchk/defs.in b/bench/emptchk/defs.in
index 2a3adcc12..6616cbbd2 100644
--- a/bench/emptchk/defs.in
+++ b/bench/emptchk/defs.in
@@ -32,7 +32,7 @@ test -f "$srcdir/defs.in" || {
    exit 1
 }
 
-RANDTGBA='@top_builddir@/src/tgbatest/randtgba@EXEEXT@'
-LTL2TGBA='@top_builddir@/src/tests/ikwiad@EXEEXT@'
+RANDTGBA='@top_builddir@/tests/core/randtgba@EXEEXT@'
+LTL2TGBA='@top_builddir@/tests/core/ikwiad@EXEEXT@'
 FORMULAE=$srcdir/formulae.ltl
 ALGORITHMS=$srcdir/algorithms
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80531918f..2d6b1c297 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,10 +56,6 @@ check_SCRIPTS += core/defs
 core/defs: $(top_builddir)/config.status $(srcdir)/core/defs.in
 	$(top_builddir)/config.status --file core/defs
 
-# These are the most used test programs, and they are also useful
-# to run manually outside the test suite.  Always build them.
-noinst_PROGRAMS = core/ikwiad core/randtgba
-
 # Keep this sorted alphabetically.
 check_PROGRAMS = \
   core/acc \
@@ -73,6 +69,7 @@ check_PROGRAMS = \
   core/graph \
   core/kind \
   core/length \
+  core/ikwiad \
   core/intvcomp \
   core/intvcmp2 \
   core/kripkecat \
@@ -84,6 +81,7 @@ check_PROGRAMS = \
   core/nequals \
   core/nenoform \
   core/ngraph \
+  core/randtgba \
   core/readsat \
   core/reduc \
   core/reduccmp \
@@ -334,7 +332,7 @@ EXTRA_DIST = \
 
 ############################## LTSMIN ##############################
 
-noinst_PROGRAMS += ltsmin/modelcheck
+check_PROGRAMS += ltsmin/modelcheck
 
 ltsmin_modelcheck_SOURCES = ltsmin/modelcheck.cc
 ltsmin_modelcheck_LDADD = $(top_builddir)/spot/ltsmin/libspotltsmin.la