diff --git a/Makefile.am b/Makefile.am index e6f98b50d..6f288b2ac 100644 --- a/Makefile.am +++ b/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 diff --git a/NEWS b/NEWS index c48bbd887..ae3ccb5a9 100644 --- a/NEWS +++ b/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 - to spot-if/ and is now installed in $includedir/spot-if/ instead - of $includedir/spot/iface/, so that installed and non-installed + non-installed version of Spot. Similarly, iface/ltsmin/ has been + renamed to spot/ltsmin/, so that installed and non-installed directories can be used similarly. * is_inherently_weak_automaton() is a new function, and diff --git a/README b/README index 7b2ec8094..831668d09 100644 --- a/README +++ b/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 -------------------- diff --git a/configure.ac b/configure.ac index 16aab263e..8088ce38a 100644 --- a/configure.ac +++ b/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 diff --git a/debian/libspot-dev.install b/debian/libspot-dev.install index 6a2a917d7..1042d0eeb 100644 --- a/debian/libspot-dev.install +++ b/debian/libspot-dev.install @@ -1,4 +1,3 @@ usr/include/spot -usr/include/spot-if usr/lib/*-*/libspot.so usr/lib/*-*/libspotltsmin.so diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 7fc573296..16c281209 100644 --- a/doc/Doxyfile.in +++ b/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-if + @top_srcdir@/spot # 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 diff --git a/spot-if/.gitignore b/spot-if/.gitignore deleted file mode 100644 index b840c2180..000000000 --- a/spot-if/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile \ No newline at end of file diff --git a/spot-if/Makefile.am b/spot-if/Makefile.am deleted file mode 100644 index 65c23d35b..000000000 --- a/spot-if/Makefile.am +++ /dev/null @@ -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 . - -SUBDIRS = ltsmin diff --git a/spot/Makefile.am b/spot/Makefile.am index 863e7a512..58cbc4683 100644 --- a/spot/Makefile.am +++ b/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 = diff --git a/spot-if/ltsmin/.gitignore b/spot/ltsmin/.gitignore similarity index 100% rename from spot-if/ltsmin/.gitignore rename to spot/ltsmin/.gitignore diff --git a/spot-if/ltsmin/Makefile.am b/spot/ltsmin/Makefile.am similarity index 97% rename from spot-if/ltsmin/Makefile.am rename to spot/ltsmin/Makefile.am index 9f7319f71..ad771dc0f 100644 --- a/spot-if/ltsmin/Makefile.am +++ b/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 diff --git a/spot-if/ltsmin/README b/spot/ltsmin/README similarity index 100% rename from spot-if/ltsmin/README rename to spot/ltsmin/README diff --git a/spot-if/ltsmin/beem-peterson.4.dve b/spot/ltsmin/beem-peterson.4.dve similarity index 100% rename from spot-if/ltsmin/beem-peterson.4.dve rename to spot/ltsmin/beem-peterson.4.dve diff --git a/spot-if/ltsmin/check.test b/spot/ltsmin/check.test similarity index 100% rename from spot-if/ltsmin/check.test rename to spot/ltsmin/check.test diff --git a/spot-if/ltsmin/defs.in b/spot/ltsmin/defs.in similarity index 100% rename from spot-if/ltsmin/defs.in rename to spot/ltsmin/defs.in diff --git a/spot-if/ltsmin/elevator2.1.pm b/spot/ltsmin/elevator2.1.pm similarity index 100% rename from spot-if/ltsmin/elevator2.1.pm rename to spot/ltsmin/elevator2.1.pm diff --git a/spot-if/ltsmin/finite.dve b/spot/ltsmin/finite.dve similarity index 100% rename from spot-if/ltsmin/finite.dve rename to spot/ltsmin/finite.dve diff --git a/spot-if/ltsmin/finite.pm b/spot/ltsmin/finite.pm similarity index 100% rename from spot-if/ltsmin/finite.pm rename to spot/ltsmin/finite.pm diff --git a/spot-if/ltsmin/finite.test b/spot/ltsmin/finite.test similarity index 100% rename from spot-if/ltsmin/finite.test rename to spot/ltsmin/finite.test diff --git a/spot-if/ltsmin/finite2.test b/spot/ltsmin/finite2.test similarity index 100% rename from spot-if/ltsmin/finite2.test rename to spot/ltsmin/finite2.test diff --git a/spot-if/ltsmin/kripke.test b/spot/ltsmin/kripke.test similarity index 100% rename from spot-if/ltsmin/kripke.test rename to spot/ltsmin/kripke.test diff --git a/spot-if/ltsmin/ltsmin.cc b/spot/ltsmin/ltsmin.cc similarity index 99% rename from spot-if/ltsmin/ltsmin.cc rename to spot/ltsmin/ltsmin.cc index 1fd60ca23..89d681f5d 100644 --- a/spot-if/ltsmin/ltsmin.cc +++ b/spot/ltsmin/ltsmin.cc @@ -30,7 +30,7 @@ # define WEXITSTATUS(x) ((x) & 0xff) #endif -#include +#include #include #include #include diff --git a/spot-if/ltsmin/ltsmin.hh b/spot/ltsmin/ltsmin.hh similarity index 100% rename from spot-if/ltsmin/ltsmin.hh rename to spot/ltsmin/ltsmin.hh diff --git a/spot-if/ltsmin/modelcheck.cc b/spot/ltsmin/modelcheck.cc similarity index 99% rename from spot-if/ltsmin/modelcheck.cc rename to spot/ltsmin/modelcheck.cc index 1abdb4230..d73634da9 100644 --- a/spot-if/ltsmin/modelcheck.cc +++ b/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 . -#include +#include #include #include #include diff --git a/spot/sanity/80columns.test b/spot/sanity/80columns.test index 6a0b7fe57..491e92c17 100755 --- a/spot/sanity/80columns.test +++ b/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" \ diff --git a/spot/sanity/style.test b/spot/sanity/style.test index d9465165f..c7ce8f7cf 100755 --- a/spot/sanity/style.test +++ b/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