bricks: move into spot directory

* bricks/brick-assert, bricks/brick-bitlevel,
bricks/brick-hash, bricks/brick-hashset,
bricks/brick-shmem, bricks/brick-types: Rename as .. .
* spot/bricks/brick-assert, spot/bricks/brick-bitlevel,
spot/bricks/brick-hash, spot/bricks/brick-hashset,
spot/bricks/brick-shmem, spot/bricks/brick-types: ... this
* Makefile.am, README, debian/copyright,
debian/libspot-dev.install, m4/bricks.m4,
spot/Makefile.am, spot/ltsmin/spins_kripke.hh,
spot/ltsmin/spins_kripke.hxx, spot/mc/bloemen.hh
spot/mc/deadlock.hh, tests/Makefile.am,
tests/core/bricks.cc: here.

Makefile.am

@@ -39,10 +39,6 @@ SUBDIRS = picosat buddy lib ltdl spot bin tests $(PYTHON_SUBDIR) $(DOC_SUBDIR) \
 UTF8 = utf8/README.md utf8/utf8.h	\
   utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h
 
-nobase_include_HEADERS= bricks/brick-assert bricks/brick-bitlevel \
-	bricks/brick-hash bricks/brick-hashset  bricks/brick-shmem \
-	bricks/brick-types
-
 DEBIAN =					\
   debian/changelog				\
   debian/changelog.in				\

README

@@ -323,12 +323,12 @@ Third party software
 --------------------
 
 buddy/            A customized version of BuDDy 2.3 (a BDD library).
-bricks/           A collection of useful C++ code provided by DiVinE 3.3.2
 ltdl/             Libtool's portable dlopen() wrapper library.
 lib/              Gnulib's portability modules.
 utf8/             Nemanja Trifunovic's utf-8 routines.
 elisp/		  Related emacs modes, used for building the documentation.
 picosat/          A distribution of PicoSAT 965 (a satsolver library).
+spot/bricks/      A collection of useful C++ code provided by DiVinE 3.3.2
 
 Build-system stuff
 ------------------

debian/copyright

@@ -49,7 +49,7 @@ License: BSD-2-Clause
  OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
  MODIFICATIONS.
 
-Files: bricks/*
+Files: spot/bricks/*
 Copyright: 2010-2014 Petr Ročkai, Jiří Weiser, Vladimír Štill
 License: BSD-2-Clause
  Permission is hereby granted, without written agreement and without

debian/libspot-dev.install

@@ -1,5 +1,5 @@
 usr/include/spot
-usr/include/bricks
+usr/include/spot/bricks
 usr/lib/*-*/libspot.so
 usr/lib/*-*/libspot.a
 usr/lib/*-*/pkgconfig/libspot.pc

m4/bricks.m4

@@ -1,4 +0,0 @@
-AC_DEFUN([AX_CHECK_BRICKS], [
-  AC_SUBST([BRICKS_CPPFLAGS], ['-I$(top_srcdir)/bricks'])
-  AC_CONFIG_SUBDIRS([bricks])
-])

spot/Makefile.am

@@ -22,6 +22,11 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
+nobase_include_HEADERS= bricks/brick-assert bricks/brick-bitlevel \
+	bricks/brick-hash bricks/brick-hashset  bricks/brick-shmem \
+	bricks/brick-types
+
+
 # List directories in the order they must be built.  Keep tests at the
 # end, after building '.' (since the current directory contains
 # libspot.la needed by the tests)

spot/ltsmin/spins_kripke.hh

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <bricks/brick-hash>
-#include <bricks/brick-hashset>
+#include <spot/bricks/brick-hash>
+#include <spot/bricks/brick-hashset>
 #include <spot/kripke/kripke.hh>
 #include <spot/ltsmin/spins_interface.hh>
 #include <spot/misc/fixpool.hh>

spot/ltsmin/spins_kripke.hxx

@@ -20,8 +20,8 @@
 #pragma once
 
 #include <algorithm>
-#include <bricks/brick-hash>
-#include <bricks/brick-hashset>
+#include <spot/bricks/brick-hash>
+#include <spot/bricks/brick-hashset>
 #include <spot/ltsmin/spins_interface.hh>
 #include <spot/misc/fixpool.hh>
 #include <spot/misc/mspool.hh>

spot/mc/bloemen.hh

@@ -21,7 +21,7 @@
 
 #include <atomic>
 #include <chrono>
-#include <bricks/brick-hashset>
+#include <spot/bricks/brick-hashset>
 #include <stdlib.h>
 #include <thread>
 #include <vector>

spot/mc/deadlock.hh

@@ -21,7 +21,7 @@
 
 #include <atomic>
 #include <chrono>
-#include <bricks/brick-hashset>
+#include <spot/bricks/brick-hashset>
 #include <stdlib.h>
 #include <thread>
 #include <vector>

tests/Makefile.am

@@ -22,7 +22,8 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
-              $(BRICKS_CPPFLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib
+              -I$(top_srcdir)/spot/bricks -I$(top_builddir)/lib \
+	      -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 LDADD = $(top_builddir)/spot/libspot.la \
        $(top_builddir)/buddy/src/libbddx.la \

tests/core/bricks.cc

@@ -18,8 +18,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config.h"
-#include <bricks/brick-hashset>
-#include <bricks/brick-hash>
+#include <spot/bricks/brick-hashset>
+#include <spot/bricks/brick-hash>
 
 struct both
 {