Move spot-if/ltsmin/ to spot/ltsmin/

* spot-if/ltsmin/: Rename as...
* spot/ltsmin/: ... this.
* spot-if/: Delete.
* Makefile.am, NEWS, README, configure.ac, debian/libspot-dev.install,
doc/Doxyfile.in, spot/Makefile.am, spot/sanity/80columns.test,
spot/sanity/style.test: Adjust.

Makefile.am

@@ -32,7 +32,7 @@ if USE_PYTHON
   PYTHON_SUBDIR = python
 endif
 
-SUBDIRS = buddy lib ltdl spot spot-if $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS)
+SUBDIRS = buddy lib ltdl spot $(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

NEWS

@@ -20,9 +20,8 @@ New in spot 1.99.6a (not yet released)
     Inside the source distribution, the subdirectory src/ has been
     renamed to spot/, so that the root of the source tree can also be
     put on the preprocessor's search path to compile against a
-    non-installed version of Spot.  Similarly, iface/ has been renamed
+    non-installed version of Spot.  Similarly, iface/ltsmin/ has been
-    to spot-if/ and is now installed in $includedir/spot-if/ instead
+    renamed to spot/ltsmin/, so that installed and non-installed
-    of $includedir/spot/iface/, so that installed and non-installed
     directories can be used similarly.
 
   * is_inherently_weak_automaton() is a new function, and

README

@@ -138,6 +138,7 @@ 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.
    tl/            Temporal Logic formulas and algorithms.
    misc/          Miscellaneous support files.
@@ -168,8 +169,6 @@ bench/            Benchmarks for ...
 python/           Python bindings for Spot and BuDDy
    tests/         Tests for these bindings
    ajax/          LTL-to-TGBA translator with web interface, using Javascript.
-spot-if/          Interfaces between Spot and other libraries.
-   ltsmin/        Interface with DiVinE2 and SpinS.
 
 Third party software
 --------------------

configure.ac

@@ -203,6 +203,8 @@ AC_CONFIG_FILES([
   spot/bin/man/Makefile
   spot/graph/Makefile
   spot/kripke/Makefile
+  spot/ltsmin/defs
+  spot/ltsmin/Makefile
   spot/Makefile
   spot/misc/Makefile
   spot/parseaut/Makefile
@@ -217,9 +219,6 @@ AC_CONFIG_FILES([
   spot/twaalgos/gtec/Makefile
   spot/twaalgos/Makefile
   spot/twa/Makefile
-  spot-if/ltsmin/defs
-  spot-if/ltsmin/Makefile
-  spot-if/Makefile
   python/ajax/Makefile
   python/Makefile
   python/tests/Makefile

debian/libspot-dev.install

@@ -1,4 +1,3 @@
 usr/include/spot
-usr/include/spot-if
 usr/lib/*-*/libspot.so
 usr/lib/*-*/libspotltsmin.so

doc/Doxyfile.in

@@ -760,8 +760,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @srcdir@/mainpage.dox \
-                         @top_srcdir@/spot \
+                         @top_srcdir@/spot
-                         @top_srcdir@/spot-if
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

spot-if/.gitignore

@@ -1,2 +0,0 @@
-Makefile.in
-Makefile

spot-if/Makefile.am

@@ -1,20 +0,0 @@
-## -*- coding: utf-8 -*-
-## Copyright (C) 2011, 2014 Laboratoire de Recherche et Développement
-## de l'Epita (LRDE).
-##
-## This file is part of Spot, a model checking library.
-##
-## Spot is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
-##
-## Spot is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-## or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-## License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-SUBDIRS = ltsmin

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 sanity
+          parseaut parsetl . bin tests ltsmin sanity
 
 lib_LTLIBRARIES = libspot.la
 libspot_la_SOURCES =

spot/ltsmin/Makefile.am

@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
               $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-ltsmindir = $(includedir)/spot-if/ltsmin
+ltsmindir = $(pkgincludedir)/ltsmin
 
 ltsmin_HEADERS = ltsmin.hh
 

spot/ltsmin/ltsmin.cc

@@ -30,7 +30,7 @@
 # define WEXITSTATUS(x) ((x) & 0xff)
 #endif
 
-#include <spot-if/ltsmin/ltsmin.hh>
+#include <spot/ltsmin/ltsmin.hh>
 #include <spot/misc/hashfunc.hh>
 #include <spot/misc/fixpool.hh>
 #include <spot/misc/mspool.hh>

spot/ltsmin/modelcheck.cc

@@ -17,7 +17,7 @@
 // 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-if/ltsmin/ltsmin.hh>
+#include <spot/ltsmin/ltsmin.hh>
 #include <spot/twaalgos/dot.hh>
 #include <spot/tl/defaultenv.hh>
 #include <spot/tl/parse.hh>

spot/sanity/80columns.test

@@ -42,7 +42,7 @@ fi
 x="$x$x$x$x$x$x$x$x$x" # 9x
 x="$x$x$x$x$x$x$x$x$x" # 81x
 
-for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
+for dir in "${INCDIR-..}"; do
 
   find "$dir" \(    -name "${1-*}.hh" \
                  -o -name "${1-*}.hxx" \

spot/sanity/style.test

@@ -52,7 +52,10 @@ export LC_ALL
 
 tmp=incltest.tmp
 
-for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
+# 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
 
   find "$dir" \(    -name "${1-*}.hh" \
                  -o -name "${1-*}.hxx" \
@@ -326,7 +329,7 @@ done
 
 
 # Rules for Makefiles.
-for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
+for dir in "${INCDIR-..}"; do
 
   find "$dir" -name "Makefile.am" -a -type f -a -print |
   while read file; do