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.

src/bin/Makefile.am

@@ -27,13 +27,14 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 LDADD = libcommon.a $(top_builddir)/lib/libgnu.a ../libspot.la
 
 noinst_LIBRARIES = libcommon.a
-libcommon_a_SOURCES = 				\
+libcommon_a_SOURCES =				\
-  common_output.cc 				\
+  common_output.cc				\
-  common_output.hh 				\
+  common_output.hh				\
   common_range.cc				\
-  common_range.hh 				\
+  common_range.hh				\
   common_r.cc					\
-  common_r.hh
+  common_r.hh					\
+  common_sys.hh
 
 bin_PROGRAMS = ltlfilt genltl randltl
 ltlfilt_SOURCES = ltlfilt.cc

src/bin/common_output.hh

@@ -22,9 +22,7 @@
 #ifndef 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 "ltlast/formula.hh"

src/bin/common_r.cc

@@ -19,12 +19,8 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
-#ifdef HAVE_CONFIG_H
+#include "common_sys.hh"
-# include "config.h"
-#endif
-
 #include "error.h"
-
 #include "common_r.hh"
 
 int simplification_level = 0;

src/bin/common_range.cc

@@ -19,10 +19,7 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
-#ifdef HAVE_CONFIG_H
+#include "common_sys.hh"
-# include "config.h"
-#endif
-
 #include "error.h"
 
 #include "common_range.hh"

src/bin/common_sys.hh

@@ -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

src/bin/genltl.cc

@@ -68,9 +68,7 @@
 //   publisher = {Springer-Verlag}
 // }
 
-#ifdef HAVE_CONFIG_H
+#include "common_sys.hh"
-# include "config.h"
-#endif
 
 #include <iostream>
 #include <fstream>

src/bin/ltlfilt.cc

@@ -19,9 +19,7 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
-#ifdef HAVE_CONFIG_H
+#include "common_sys.hh"
-# include "config.h"
-#endif
 
 #include <cstdlib>
 #include <vector>

src/bin/randltl.cc

@@ -19,9 +19,7 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
-#ifdef HAVE_CONFIG_H
+#include "common_sys.hh"
-# include "config.h"
-#endif
 
 #include <iostream>
 #include <fstream>