From 01cceef29a61f2cdbe539d9653a3d03f66326013 Mon Sep 17 00:00:00 2001 From: Etienne Renault Date: Thu, 12 Jul 2018 09:42:12 +0000 Subject: [PATCH] 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 | 4 ---- README | 2 +- debian/copyright | 2 +- debian/libspot-dev.install | 2 +- m4/bricks.m4 | 4 ---- spot/Makefile.am | 5 +++++ {bricks => spot/bricks}/brick-assert | 0 {bricks => spot/bricks}/brick-bitlevel | 0 {bricks => spot/bricks}/brick-hash | 0 {bricks => spot/bricks}/brick-hashset | 0 {bricks => spot/bricks}/brick-shmem | 0 {bricks => spot/bricks}/brick-types | 0 spot/ltsmin/spins_kripke.hh | 4 ++-- spot/ltsmin/spins_kripke.hxx | 4 ++-- spot/mc/bloemen.hh | 2 +- spot/mc/deadlock.hh | 2 +- tests/Makefile.am | 3 ++- tests/core/bricks.cc | 4 ++-- 18 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 m4/bricks.m4 rename {bricks => spot/bricks}/brick-assert (100%) rename {bricks => spot/bricks}/brick-bitlevel (100%) rename {bricks => spot/bricks}/brick-hash (100%) rename {bricks => spot/bricks}/brick-hashset (100%) rename {bricks => spot/bricks}/brick-shmem (100%) rename {bricks => spot/bricks}/brick-types (100%) diff --git a/Makefile.am b/Makefile.am index 7ef91b5e8..186472e94 100644 --- a/Makefile.am +++ b/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 \ diff --git a/README b/README index 6ce7271a0..ee0d2897a 100644 --- a/README +++ b/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 ------------------ diff --git a/debian/copyright b/debian/copyright index efae81d0d..aeff4a901 100644 --- a/debian/copyright +++ b/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 diff --git a/debian/libspot-dev.install b/debian/libspot-dev.install index beae1938a..68c76e14f 100644 --- a/debian/libspot-dev.install +++ b/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 diff --git a/m4/bricks.m4 b/m4/bricks.m4 deleted file mode 100644 index a26b55fc4..000000000 --- a/m4/bricks.m4 +++ /dev/null @@ -1,4 +0,0 @@ -AC_DEFUN([AX_CHECK_BRICKS], [ - AC_SUBST([BRICKS_CPPFLAGS], ['-I$(top_srcdir)/bricks']) - AC_CONFIG_SUBDIRS([bricks]) -]) diff --git a/spot/Makefile.am b/spot/Makefile.am index f30a501ef..51b604cf7 100644 --- a/spot/Makefile.am +++ b/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) diff --git a/bricks/brick-assert b/spot/bricks/brick-assert similarity index 100% rename from bricks/brick-assert rename to spot/bricks/brick-assert diff --git a/bricks/brick-bitlevel b/spot/bricks/brick-bitlevel similarity index 100% rename from bricks/brick-bitlevel rename to spot/bricks/brick-bitlevel diff --git a/bricks/brick-hash b/spot/bricks/brick-hash similarity index 100% rename from bricks/brick-hash rename to spot/bricks/brick-hash diff --git a/bricks/brick-hashset b/spot/bricks/brick-hashset similarity index 100% rename from bricks/brick-hashset rename to spot/bricks/brick-hashset diff --git a/bricks/brick-shmem b/spot/bricks/brick-shmem similarity index 100% rename from bricks/brick-shmem rename to spot/bricks/brick-shmem diff --git a/bricks/brick-types b/spot/bricks/brick-types similarity index 100% rename from bricks/brick-types rename to spot/bricks/brick-types diff --git a/spot/ltsmin/spins_kripke.hh b/spot/ltsmin/spins_kripke.hh index 42159cbb8..c7bbec95e 100644 --- a/spot/ltsmin/spins_kripke.hh +++ b/spot/ltsmin/spins_kripke.hh @@ -19,8 +19,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/spot/ltsmin/spins_kripke.hxx b/spot/ltsmin/spins_kripke.hxx index eb2e370ca..928d767b7 100644 --- a/spot/ltsmin/spins_kripke.hxx +++ b/spot/ltsmin/spins_kripke.hxx @@ -20,8 +20,8 @@ #pragma once #include -#include -#include +#include +#include #include #include #include diff --git a/spot/mc/bloemen.hh b/spot/mc/bloemen.hh index 4616be7e8..02ae33415 100644 --- a/spot/mc/bloemen.hh +++ b/spot/mc/bloemen.hh @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/spot/mc/deadlock.hh b/spot/mc/deadlock.hh index 73a5df7a5..e816d6fc3 100644 --- a/spot/mc/deadlock.hh +++ b/spot/mc/deadlock.hh @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/Makefile.am b/tests/Makefile.am index 44f6b5aab..98c21d398 100644 --- a/tests/Makefile.am +++ b/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 \ diff --git a/tests/core/bricks.cc b/tests/core/bricks.cc index 9acd48a51..60e0a620d 100644 --- a/tests/core/bricks.cc +++ b/tests/core/bricks.cc @@ -18,8 +18,8 @@ // along with this program. If not, see . #include "config.h" -#include -#include +#include +#include struct both {