move spot/bin/ and spot/tests/ up by one level

* spot/bin/: Move...
* bin/: ... here.
* spot/tests/: Move...
* tests/: ... here.
* Makefile.am, README, bench/stutter/Makefile.am,
bench/stutter/stutter_invariance_formulas.cc, doc/Makefile.am,
configure.ac, debian/rules, spot/Makefile.am, spot/ltsmin/Makefile.am,
spot/ltsmin/kripke.test, spot/sanity/style.test, python/tests/run.in:
Adjust.

Makefile.am

@@ -32,7 +32,7 @@ if USE_PYTHON
   PYTHON_SUBDIR = python
 endif
 
-SUBDIRS = buddy lib ltdl spot $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS)
+SUBDIRS = buddy lib ltdl spot bin tests $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS)
 
 UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h	\
   utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h

README

@@ -135,8 +135,6 @@ Core directories
 ----------------
 
 spot/             Sources for libspot.
-   bin/           User tools built using the Spot library.
-      man/        Man pages for the above tools.
    graph/         Graph representations.
    ltsmin/        Interface with DiVinE2 and SpinS.  (Not part of libspot.)
    kripke/        Kripke Structure interface.
@@ -147,11 +145,13 @@ spot/             Sources for libspot.
    priv/          Private algorithms, used internally but not exported.
    ta/            TA objects and cousins (TGTA).
    taalgos/       Algorithms on TA/TGTA.
-   tests/         Tests for the whole library.
    twa/           TωA objects and cousins (Transition-based ω-Automata).
    twaalgos/      Algorithms on TωA.
       gtec/       Couvreur's Emptiness-Check.
    sanity/        Sanity tests for the whole project.
+bin/              Command-line tools built on top of libspot.
+   man/           Man pages for the above tools.
+tests/            Tests for libspot and the binaries.
 doc/              Documentation for Spot.
    org/           Source of userdoc/ as org-mode files.
    tl/            Documentation of the Temporal Logic operators.

bench/stutter/Makefile.am

@@ -21,8 +21,10 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-LDADD = $(top_builddir)/spot/bin/libcommon.a ../../lib/libgnu.la	\
-        ../../spot/libspot.la
+LDADD =						\
+  $(top_builddir)/bin/libcommon.a		\
+  $(top_builddir)/lib/libgnu.la			\
+  $(top_builddir)/spot/libspot.la
 
 bin_PROGRAMS = stutter_invariance_randomgraph \
 	       stutter_invariance_formulas

bench/stutter/stutter_invariance_formulas.cc

@@ -17,10 +17,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "spot/bin/common_sys.hh"
-#include "spot/bin/common_setup.hh"
-#include "spot/bin/common_finput.hh"
-#include "spot/bin/common_output.hh"
+#include "bin/common_sys.hh"
+#include "bin/common_setup.hh"
+#include "bin/common_finput.hh"
+#include "bin/common_output.hh"
 #include <spot/twaalgos/translate.hh>
 #include <spot/twaalgos/stutter.hh>
 #include <spot/twaalgos/stats.hh>

bin/Makefile.am

@@ -22,7 +22,10 @@ SUBDIRS = . man
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-LDADD = libcommon.a $(top_builddir)/lib/libgnu.la ../libspot.la
+LDADD =						\
+  libcommon.a					\
+  $(top_builddir)/lib/libgnu.la			\
+  $(top_builddir)/spot/libspot.la
 
 noinst_LIBRARIES = libcommon.a
 libcommon_a_SOURCES =				\

configure.ac

@@ -181,6 +181,8 @@ fi)])
 
 AC_CONFIG_FILES([
   Makefile
+  bin/Makefile
+  bin/man/Makefile
   bench/Makefile
   bench/dtgbasat/Makefile
   bench/emptchk/Makefile
@@ -199,8 +201,6 @@ AC_CONFIG_FILES([
   doc/org/init.el
   elisp/Makefile
   lib/Makefile
-  spot/bin/Makefile
-  spot/bin/man/Makefile
   spot/graph/Makefile
   spot/kripke/Makefile
   spot/ltsmin/defs
@@ -213,8 +213,6 @@ AC_CONFIG_FILES([
   spot/sanity/Makefile
   spot/taalgos/Makefile
   spot/ta/Makefile
-  spot/tests/defs
-  spot/tests/Makefile
   spot/tl/Makefile
   spot/twaalgos/gtec/Makefile
   spot/twaalgos/Makefile
@@ -222,6 +220,8 @@ AC_CONFIG_FILES([
   python/ajax/Makefile
   python/Makefile
   python/tests/Makefile
+  tests/defs
+  tests/Makefile
   tools/x-to-1
 ])
 AC_CONFIG_FILES([doc/org/g++wrap], [chmod +x doc/org/g++wrap])

debian/rules

@@ -50,8 +50,8 @@ PYOTHERS=$(filter-out $(PYDEFAULT), $(shell py3versions --supported))
 # compiled with -flto, the exception never traverses argp.  Moving
 # the try/catch block inside parse_opt() also fixes this praticular
 # problem, but who knows about other exceptions?   So as a workaround,
-# we simply disable -flto in spot/bin/.
-FLTOWORKAROUND = perl -pi -e s/-flto// spot/bin/Makefile
+# we simply disable -flto in bin/.
+FLTOWORKAROUND = perl -pi -e s/-flto// bin/Makefile
 
 # We want to build Spot twice: once to get profile data, and a second
 # time to use it.

doc/Makefile.am

@@ -58,7 +58,7 @@ org:
 
 org-man:
 	mkdir -p $(srcdir)/userdoc/man
-	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/spot/bin/man $(srcdir)/userdoc/man
+	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/bin/man $(srcdir)/userdoc/man
 
 ORG_FILES = \
   org/.dir-locals.el.in \

python/tests/run.in

@@ -32,7 +32,7 @@ modpath='../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs'
 # Python 2.6.
 pypath='..:../.libs:@srcdir@/..:@srcdir@/../.libs:$PYTHONPATH'
 
-PATH="@abs_top_builddir@/spot/bin:$PATH"
+PATH="@abs_top_builddir@/bin:$PATH"
 export PATH
 
 test -z "$1" &&

spot/Makefile.am

@@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # end, after building '.' (since the current directory contains
 # libspot.la needed by the tests)
 SUBDIRS = misc priv tl graph twa twaalgos ta taalgos kripke	\
-          parseaut parsetl . bin tests ltsmin sanity
+          parseaut parsetl . ltsmin sanity
 
 lib_LTLIBRARIES = libspot.la
 libspot_la_SOURCES =

spot/ltsmin/Makefile.am

@@ -42,10 +42,10 @@ check_SCRIPTS = defs
 TESTS = check.test finite.test finite2.test kripke.test
 EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm
 
-kripke.test: $(top_builddir)/spot/tests/parse_print$(EXEEXT)
+kripke.test: $(top_builddir)/tests/parse_print$(EXEEXT)
 
-$(top_builddir)/spot/tests/parse_print$(EXEEXT):
-	cd $(top_builddir)/spot/tests && \
+$(top_builddir)/tests/parse_print$(EXEEXT):
+	cd $(top_builddir)/tests && \
 	$(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT)
 
 distclean-local:

spot/ltsmin/kripke.test

@@ -33,10 +33,10 @@ fi
 
 set -e
 
-run 0 ../modelcheck -gK ${srcdir}/finite.dve 'F("P.a > 5")' > output
-run 0 ${top_builddir}/spot/tests/parse_print output | tr -d '"' > output2
+run 0 ../modelcheck -gK $srcdir/finite.dve 'F("P.a > 5")' > output
+run 0 $top_builddir/tests/parse_print output | tr -d '"' > output2
 tr -d '"' < output >outputF
 cmp outputF output2
 
 ../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP
-${top_builddir}/spot/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
+$top_builddir/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'

spot/sanity/style.test

@@ -55,7 +55,7 @@ tmp=incltest.tmp
 # We used to loop over more directories before the source tree was
 # rearranged.  So there is only one left today, but we keep the loop
 # in case we want to add more in the future.
-for dir in "${INCDIR-..}"; do
+for dir in "${INCDIR-..}" "${INCDIR-..}/../bin" "${INCDIR-..}/../tests"; do
 
   find "$dir" \(    -name "${1-*}.hh" \
                  -o -name "${1-*}.hxx" \
@@ -329,7 +329,7 @@ done
 
 
 # Rules for Makefiles.
-for dir in "${INCDIR-..}"; do
+for dir in "${INCDIR-..}" "${INCDIR-..}/../bin" "${INCDIR-..}/../tests"; do
 
   find "$dir" -name "Makefile.am" -a -type f -a -print |
   while read file; do

tests/Makefile.am

@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-LDADD = ../libspot.la
+LDADD = $(top_builddir)/spot/libspot.la
 
 # These are the most used test programs, and they are also useful
 # to run manually outside the test suite.  Always build them.

tests/defs.in

@@ -85,7 +85,7 @@ run()
   if test -n "$VALGRIND"; then
     exec 6>valgrind.err
     GLIBCPP_FORCE_NEW=1 \
-    ../../../libtool --mode=execute \
+    ../../libtool --mode=execute \
     $VALGRIND --tool=memcheck --leak-check=yes --log-fd=6 -q "$@" ||
       exitcode=$?
     cat valgrind.err 1>&2