From 5a5459f8be2319280fb931018ce2e15004561ec7 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 5 Jan 2004 15:24:18 +0000 Subject: [PATCH] * src/ltlparse/Makefile.am ($(FROM_LTLPARSE_YY_MAIN)): Use $(FROM_LTLPARSE_YY_MAIN), not $@, because $@ can contains VPATH and we do not want Bison to see absolute paths. * src/tgbaparse/Makefile.am ($(FROM_TGBAPARSE_YY_MAIN)): Likewise. --- ChangeLog | 5 +++++ src/ltlparse/Makefile.am | 4 ++-- src/tgbaparse/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c0c0bd4a..1ca20b704 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-01-05 Alexandre Duret-Lutz + * src/ltlparse/Makefile.am ($(FROM_LTLPARSE_YY_MAIN)): + Use $(FROM_LTLPARSE_YY_MAIN), not $@, because $@ can contains + VPATH and we do not want Bison to see absolute paths. + * src/tgbaparse/Makefile.am ($(FROM_TGBAPARSE_YY_MAIN)): Likewise. + * src/ltltest/parseerr.test: Adjust. * src/ltlparse/ltlparse.yy: Simplify error handling now that Bison will call destructors. Give each operator a full name, so that diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index e7a0c86d2..37ace9e97 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), +## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. ## @@ -44,7 +44,7 @@ $(FROM_LTLPARSE_YY_MAIN): $(srcdir)/$(LTLPARSE_YY) ## in the generated include statements. cd $(srcdir) && \ bison --defines --locations --skeleton=lalr1.cc --report=all \ - $(LTLPARSE_YY) -o $@ + $(LTLPARSE_YY) -o $(FROM_LTLPARSE_YY_MAIN) $(FROM_LTLPARSE_YY_OTHERS): $(LTLPARSE_YY) @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) $(FROM_LTLPARSE_YY_MAIN) diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am index 4c08de287..828293474 100644 --- a/src/tgbaparse/Makefile.am +++ b/src/tgbaparse/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), +## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. ## @@ -48,7 +48,7 @@ $(FROM_TGBAPARSE_YY_MAIN): $(srcdir)/$(TGBAPARSE_YY) ## in the generated include statements. cd $(srcdir) && \ bison --defines --locations --skeleton=lalr1.cc --report=all \ - $(TGBAPARSE_YY) -o $@ + $(TGBAPARSE_YY) -o $(FROM_TGBAPARSE_YY_MAIN) $(FROM_TGBAPARSE_YY_OTHERS): $(TGBAPARSE_YY) @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) $(FROM_TGBAPARSE_YY_MAIN)