Fix multiple inclusions of config.h.
* src/bin/common_sys.hh: New file. * src/bin/Makefile.am: Add it. * src/bin/common_output.hh, src/bin/common_r.cc, src/bin/common_range.cc, src/bin/genltl.cc, src/bin/ltlfilt.cc, src/bin/randltl.cc: Include common_sys.hh instead of config.h.
This commit is contained in:
parent
04b5e37055
commit
26deb56a9c
8 changed files with 41 additions and 26 deletions
|
|
@ -33,7 +33,8 @@ libcommon_a_SOURCES = \
|
||||||
common_range.cc \
|
common_range.cc \
|
||||||
common_range.hh \
|
common_range.hh \
|
||||||
common_r.cc \
|
common_r.cc \
|
||||||
common_r.hh
|
common_r.hh \
|
||||||
|
common_sys.hh
|
||||||
|
|
||||||
bin_PROGRAMS = ltlfilt genltl randltl
|
bin_PROGRAMS = ltlfilt genltl randltl
|
||||||
ltlfilt_SOURCES = ltlfilt.cc
|
ltlfilt_SOURCES = ltlfilt.cc
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,7 @@
|
||||||
#ifndef SPOT_BIN_COMMON_OUTPUT_HH
|
#ifndef SPOT_BIN_COMMON_OUTPUT_HH
|
||||||
#define SPOT_BIN_COMMON_OUTPUT_HH
|
#define SPOT_BIN_COMMON_OUTPUT_HH
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <argp.h>
|
#include <argp.h>
|
||||||
#include "ltlast/formula.hh"
|
#include "ltlast/formula.hh"
|
||||||
|
|
|
||||||
|
|
@ -19,12 +19,8 @@
|
||||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
// 02111-1307, USA.
|
// 02111-1307, USA.
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
|
|
||||||
#include "common_r.hh"
|
#include "common_r.hh"
|
||||||
|
|
||||||
int simplification_level = 0;
|
int simplification_level = 0;
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,7 @@
|
||||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
// 02111-1307, USA.
|
// 02111-1307, USA.
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
|
|
||||||
#include "common_range.hh"
|
#include "common_range.hh"
|
||||||
|
|
|
||||||
29
src/bin/common_sys.hh
Normal file
29
src/bin/common_sys.hh
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
// -*- coding: utf-8 -*-
|
||||||
|
// Copyright (C) 2012 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
||||||
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
|
// 02111-1307, USA.
|
||||||
|
|
||||||
|
#ifndef SPOT_BIN_COMMON_SYS_HH
|
||||||
|
#define SPOT_BIN_COMMON_SYS_HH
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // SPOT_BIN_COMMON_SYS_HH
|
||||||
|
|
@ -68,9 +68,7 @@
|
||||||
// publisher = {Springer-Verlag}
|
// publisher = {Springer-Verlag}
|
||||||
// }
|
// }
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,7 @@
|
||||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
// 02111-1307, USA.
|
// 02111-1307, USA.
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,7 @@
|
||||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||||
// 02111-1307, USA.
|
// 02111-1307, USA.
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "common_sys.hh"
|
||||||
# include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue