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.
This commit is contained in:
Etienne Renault
parent
b115d2f9b1
commit
01cceef29a
18 changed files with 18 additions and 20 deletions
|
|
@ -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/README.md utf8/utf8.h \
|
||||||
utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.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 = \
|
||||||
debian/changelog \
|
debian/changelog \
|
||||||
debian/changelog.in \
|
debian/changelog.in \
|
||||||
|
|
|
||||||
2
README
2
README
|
|
@ -323,12 +323,12 @@ Third party software
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
buddy/ A customized version of BuDDy 2.3 (a BDD library).
|
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.
|
ltdl/ Libtool's portable dlopen() wrapper library.
|
||||||
lib/ Gnulib's portability modules.
|
lib/ Gnulib's portability modules.
|
||||||
utf8/ Nemanja Trifunovic's utf-8 routines.
|
utf8/ Nemanja Trifunovic's utf-8 routines.
|
||||||
elisp/ Related emacs modes, used for building the documentation.
|
elisp/ Related emacs modes, used for building the documentation.
|
||||||
picosat/ A distribution of PicoSAT 965 (a satsolver library).
|
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
|
Build-system stuff
|
||||||
------------------
|
------------------
|
||||||
|
|
|
||||||
2
debian/copyright
vendored
2
debian/copyright
vendored
|
|
@ -49,7 +49,7 @@ License: BSD-2-Clause
|
||||||
OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
|
OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
|
||||||
MODIFICATIONS.
|
MODIFICATIONS.
|
||||||
|
|
||||||
Files: bricks/*
|
Files: spot/bricks/*
|
||||||
Copyright: 2010-2014 Petr Ročkai, Jiří Weiser, Vladimír Štill
|
Copyright: 2010-2014 Petr Ročkai, Jiří Weiser, Vladimír Štill
|
||||||
License: BSD-2-Clause
|
License: BSD-2-Clause
|
||||||
Permission is hereby granted, without written agreement and without
|
Permission is hereby granted, without written agreement and without
|
||||||
|
|
|
||||||
2
debian/libspot-dev.install
vendored
2
debian/libspot-dev.install
vendored
|
|
@ -1,5 +1,5 @@
|
||||||
usr/include/spot
|
usr/include/spot
|
||||||
usr/include/bricks
|
usr/include/spot/bricks
|
||||||
usr/lib/*-*/libspot.so
|
usr/lib/*-*/libspot.so
|
||||||
usr/lib/*-*/libspot.a
|
usr/lib/*-*/libspot.a
|
||||||
usr/lib/*-*/pkgconfig/libspot.pc
|
usr/lib/*-*/pkgconfig/libspot.pc
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
AC_DEFUN([AX_CHECK_BRICKS], [
|
|
||||||
AC_SUBST([BRICKS_CPPFLAGS], ['-I$(top_srcdir)/bricks'])
|
|
||||||
AC_CONFIG_SUBDIRS([bricks])
|
|
||||||
])
|
|
||||||
|
|
@ -22,6 +22,11 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = subdir-objects
|
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
|
# List directories in the order they must be built. Keep tests at the
|
||||||
# end, after building '.' (since the current directory contains
|
# end, after building '.' (since the current directory contains
|
||||||
# libspot.la needed by the tests)
|
# libspot.la needed by the tests)
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <bricks/brick-hash>
|
#include <spot/bricks/brick-hash>
|
||||||
#include <bricks/brick-hashset>
|
#include <spot/bricks/brick-hashset>
|
||||||
#include <spot/kripke/kripke.hh>
|
#include <spot/kripke/kripke.hh>
|
||||||
#include <spot/ltsmin/spins_interface.hh>
|
#include <spot/ltsmin/spins_interface.hh>
|
||||||
#include <spot/misc/fixpool.hh>
|
#include <spot/misc/fixpool.hh>
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <bricks/brick-hash>
|
#include <spot/bricks/brick-hash>
|
||||||
#include <bricks/brick-hashset>
|
#include <spot/bricks/brick-hashset>
|
||||||
#include <spot/ltsmin/spins_interface.hh>
|
#include <spot/ltsmin/spins_interface.hh>
|
||||||
#include <spot/misc/fixpool.hh>
|
#include <spot/misc/fixpool.hh>
|
||||||
#include <spot/misc/mspool.hh>
|
#include <spot/misc/mspool.hh>
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <bricks/brick-hashset>
|
#include <spot/bricks/brick-hashset>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <bricks/brick-hashset>
|
#include <spot/bricks/brick-hashset>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = subdir-objects
|
AUTOMAKE_OPTIONS = subdir-objects
|
||||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
|
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)
|
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
|
||||||
LDADD = $(top_builddir)/spot/libspot.la \
|
LDADD = $(top_builddir)/spot/libspot.la \
|
||||||
$(top_builddir)/buddy/src/libbddx.la \
|
$(top_builddir)/buddy/src/libbddx.la \
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <bricks/brick-hashset>
|
#include <spot/bricks/brick-hashset>
|
||||||
#include <bricks/brick-hash>
|
#include <spot/bricks/brick-hash>
|
||||||
|
|
||||||
struct both
|
struct both
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue