diff --git a/ChangeLog b/ChangeLog index 137cffe36..6489ca9e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2011-12-18 Alexandre Duret-Lutz + + Fix VPATH builds, now that hash.hh include _config.h + + * iface/dve2/Makefile.am, src/eltlparse/Makefile.am + src/eltltest/Makefile.am, src/evtgba/Makefile.am, + src/evtgbaalgos/Makefile.am, src/evtgbaparse/Makefile.am, + src/evtgbatest/Makefile.am, src/kripke/Makefile.am, + src/kripketest/Makefile.am, src/ltlast/Makefile.am, + src/ltlparse/Makefile.am, src/ltltest/Makefile.am, + src/ltlvisit/Makefile.am, src/misc/Makefile.am, + src/neverparse/Makefile.am, src/saba/Makefile.am, + src/sabaalgos/Makefile.am, src/sabatest/Makefile.am, + src/sanity/Makefile.am, src/tgba/Makefile.am, + src/tgbaalgos/Makefile.am, src/tgbaalgos/gtec/Makefile.am, + src/tgbaparse/Makefile.am, src/tgbatest/Makefile.am, + wrap/python/Makefile.am (AM_CPPFLAGS): Make sure + $(top_builddir)/src is included. + 2011-12-16 Alexandre Duret-Lutz Perform WDBA minimization before degeneralization. diff --git a/iface/dve2/Makefile.am b/iface/dve2/Makefile.am index aef5a7530..5d20765a8 100644 --- a/iface/dve2/Makefile.am +++ b/iface/dve2/Makefile.am @@ -18,7 +18,8 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \ + $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl AM_CXXFLAGS = $(WARNING_CXXFLAGS) dve2dir = $(pkgincludedir)/iface/dve2 diff --git a/src/eltlparse/Makefile.am b/src/eltlparse/Makefile.am index d7d1e6f81..5fc9ae4c0 100644 --- a/src/eltlparse/Makefile.am +++ b/src/eltlparse/Makefile.am @@ -5,7 +5,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## Spot is distributed in the hope that it will be useful, but WITHOUT @@ -18,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. -DYY_NO_INPUT +AM_CPPFLAGS = -I$(srcdir)/.. -I.. -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/eltltest/Makefile.am b/src/eltltest/Makefile.am index f391bd696..076becc79 100644 --- a/src/eltltest/Makefile.am +++ b/src/eltltest/Makefile.am @@ -1,8 +1,5 @@ -## Copyright (C) 2009 Laboratoire de Recherche et Développement +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). -## Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de -## Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), -## Université Pierre et Marie Curie. ## ## This file is part of Spot, a model checking library. ## @@ -21,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/src/evtgba/Makefile.am b/src/evtgba/Makefile.am index 53ddc8932..a0087bffe 100644 --- a/src/evtgba/Makefile.am +++ b/src/evtgba/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) evtgbadir = $(pkgincludedir)/evtgba diff --git a/src/evtgbaalgos/Makefile.am b/src/evtgbaalgos/Makefile.am index 5b23df795..d134d125f 100644 --- a/src/evtgbaalgos/Makefile.am +++ b/src/evtgbaalgos/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) evtgbaalgosdir = $(pkgincludedir)/evtgbaalgos diff --git a/src/evtgbaparse/Makefile.am b/src/evtgbaparse/Makefile.am index 69b08fa79..8424315a5 100644 --- a/src/evtgbaparse/Makefile.am +++ b/src/evtgbaparse/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/evtgbatest/Makefile.am b/src/evtgbatest/Makefile.am index 362960a94..ab2e7b7f9 100644 --- a/src/evtgbatest/Makefile.am +++ b/src/evtgbatest/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/src/kripke/Makefile.am b/src/kripke/Makefile.am index 2fdd84c44..a5d693ed5 100644 --- a/src/kripke/Makefile.am +++ b/src/kripke/Makefile.am @@ -1,4 +1,5 @@ -## Copyright (C) 2009 Laboratoire de Recherche et Developpement de l'Epita +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Developpement +## de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. ## @@ -17,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) kripkedir = $(pkgincludedir)/kripke diff --git a/src/kripketest/Makefile.am b/src/kripketest/Makefile.am index 15b832a91..3966021c5 100644 --- a/src/kripketest/Makefile.am +++ b/src/kripketest/Makefile.am @@ -1,4 +1,5 @@ -## Copyright (C) 2011 Laboratoire de Recherche et Developpement de l'Epita +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE) ## ## This file is part of Spot, a model checking library. ## @@ -17,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) kripketestdir = $(pkgincludedir)/kripketest diff --git a/src/ltlast/Makefile.am b/src/ltlast/Makefile.am index aaab8d5ee..a957a432a 100644 --- a/src/ltlast/Makefile.am +++ b/src/ltlast/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement +## de l'Epita (LRDE). ## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. +AM_CPPFLAGS = -I$(srcdir)/.. -I.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) ltlastdir = $(pkgincludedir)/ltlast diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index 753afbee1..39a222881 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. -DYY_NO_INPUT +AM_CPPFLAGS = -I$(srcdir)/.. -I.. -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/ltltest/Makefile.am b/src/ltltest/Makefile.am index 4bf4c9fff..7f2a2f42b 100644 --- a/src/ltltest/Makefile.am +++ b/src/ltltest/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement +## Copyright (C) 2009, 2010, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de ## Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am index 642b1a030..6456f4250 100644 --- a/src/ltlvisit/Makefile.am +++ b/src/ltlvisit/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) ltlvisitdir = $(pkgincludedir)/ltlvisit diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 014ca5e63..33ac11483 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) miscdir = $(pkgincludedir)/misc diff --git a/src/neverparse/Makefile.am b/src/neverparse/Makefile.am index 855c82431..4015032c8 100644 --- a/src/neverparse/Makefile.am +++ b/src/neverparse/Makefile.am @@ -18,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/saba/Makefile.am b/src/saba/Makefile.am index 676f2863e..59275d7c0 100644 --- a/src/saba/Makefile.am +++ b/src/saba/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2009 Laboratoire de Recherche et Développement +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. @@ -18,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) sabadir = $(pkgincludedir)/saba diff --git a/src/sabaalgos/Makefile.am b/src/sabaalgos/Makefile.am index 9c517d759..f57a375ce 100644 --- a/src/sabaalgos/Makefile.am +++ b/src/sabaalgos/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2009 Laboratoire de Recherche et Développement +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. @@ -18,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) sabaalgosdir = $(pkgincludedir)/sabaalgos diff --git a/src/sabatest/Makefile.am b/src/sabatest/Makefile.am index 2157ad1c8..a97ade645 100644 --- a/src/sabatest/Makefile.am +++ b/src/sabatest/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2009 Laboratoire de Recherche et Développement +## Copyright (C) 2009, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## ## This file is part of Spot, a model checking library. @@ -18,7 +18,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/src/sanity/Makefile.am b/src/sanity/Makefile.am index 30e077978..f252fdab6 100644 --- a/src/sanity/Makefile.am +++ b/src/sanity/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2010 Laboratoire de Recherche et Développement +## Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement ## de l'Epita (LRDE). ## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) # Run `make TESTHEADER=foo.hh check' if you want to check only one diff --git a/src/tgba/Makefile.am b/src/tgba/Makefile.am index 9277626f0..484194e5b 100644 --- a/src/tgba/Makefile.am +++ b/src/tgba/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) tgbadir = $(pkgincludedir)/tgba diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am index dc56b1cda..718741cf5 100644 --- a/src/tgbaalgos/Makefile.am +++ b/src/tgbaalgos/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2008, 2009, 2010 Laboratoire de Recherche et +## Copyright (C) 2008, 2009, 2010, 2011 Laboratoire de Recherche et ## Développement de l'Epita (LRDE). ## Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris ## 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), @@ -23,7 +23,7 @@ SUBDIRS = gtec -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) tgbaalgosdir = $(pkgincludedir)/tgbaalgos diff --git a/src/tgbaalgos/gtec/Makefile.am b/src/tgbaalgos/gtec/Makefile.am index b8602669a..790c0a7cb 100644 --- a/src/tgbaalgos/gtec/Makefile.am +++ b/src/tgbaalgos/gtec/Makefile.am @@ -1,3 +1,5 @@ +## Copyright (C) 2011 Laboratoire de Recherche et Developpement de +## l'Epita (LRDE). ## Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. @@ -19,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/../.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/../.. -I../.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) gtecdir = $(pkgincludedir)/tgbaalgos/gtec diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am index 5b850eca1..2011375b0 100644 --- a/src/tgbaparse/Makefile.am +++ b/src/tgbaparse/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT # Disable -Werror because too many versions of flex yield warnings. AM_CXXFLAGS = $(WARNING_CXXFLAGS:-Werror=) diff --git a/src/tgbatest/Makefile.am b/src/tgbatest/Makefile.am index f2fd0c53f..59036a4e6 100644 --- a/src/tgbatest/Makefile.am +++ b/src/tgbatest/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) +AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) LDADD = ../libspot.la diff --git a/wrap/python/Makefile.am b/wrap/python/Makefile.am index 04aec2052..386013d20 100644 --- a/wrap/python/Makefile.am +++ b/wrap/python/Makefile.am @@ -23,8 +23,8 @@ SUBDIRS = . ajax tests -AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) \ - -DSWIG_TYPE_TABLE=spot +AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src -I$(top_builddir)/src \ + $(BUDDY_CPPFLAGS) -DSWIG_TYPE_TABLE=spot EXTRA_DIST = spot.i buddy.i python_PYTHON = $(srcdir)/spot.py $(srcdir)/buddy.py