From 05f724108dd357d077f2010a1f7b043a854c633a Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 26 Jun 2003 14:16:29 +0000 Subject: [PATCH] * src/ltlast/Makefile.am (ltlastdir, ltlast_HEADERS): New variables. (libltlast_la_SOURCES): Move all headers to ltlast_HEADERS. * src/ltlenv/Makefile.am (ltlenvdir, ltlenv_HEADERS): New variables. (libltlenv_la_SOURCES): Move all headers to ltlenv_HEADERS. * src/ltlparse/Makefile.am (ltlparsedir, ltlparse_HEADERS): New variables. (libltlparse_la_SOURCES): Move all public headers to ltlparse_HEADERS. * src/ltlvisit/Makefile.am (ltlvisitdir, ltlvisit_HEADERS): New variables. (libltlvisit_la_SOURCES): Move all headers to ltlparse_HEADERS. * src/misc/Makefile.am (include_HEADERS): Rename as .. (misc_HEADERS): ... this. (miscdir): New variable. * src/tgba/Makefile.am (tgbadir, tgba_HEADERS): New variables. (libtgba_la_SOURCES): Move all headers to tgba_HEADERS. * src/tgbaalgos/Makefile.am (tgbaalgosdir, tgbaalgos_HEADERS): New variables. (libtgbaalgos_la_SOURCES): Move all headers to tgbaalgos_HEADERS. * src/tgbaparse/Makefile.am (tgbaparsedir, tgbaparse_HEADERS): New variables. (libtgbaparse_la_SOURCES): Move all public headers to tgbaparse_HEADERS. * src/tgbaparse/public.hh: Include ltlparse/location.hh, not location.hh. --- ChangeLog | 39 ++++++++++++++++++++++++++------ src/ltlast/Makefile.am | 23 +++++++++++-------- src/ltlenv/Makefile.am | 10 ++++++--- src/ltlparse/Makefile.am | 10 +++++++-- src/ltlvisit/Makefile.am | 22 ++++++++++-------- src/misc/Makefile.am | 4 ++-- src/tgba/Makefile.am | 47 ++++++++++++++++++++++----------------- src/tgbaalgos/Makefile.am | 10 ++++++--- src/tgbaparse/Makefile.am | 9 ++++++-- src/tgbaparse/public.hh | 2 +- 10 files changed, 117 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6acf0ea50..8ca6738a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,30 @@ 2003-06-26 Alexandre Duret-Lutz + * src/ltlast/Makefile.am (ltlastdir, ltlast_HEADERS): New variables. + (libltlast_la_SOURCES): Move all headers to ltlast_HEADERS. + * src/ltlenv/Makefile.am (ltlenvdir, ltlenv_HEADERS): New variables. + (libltlenv_la_SOURCES): Move all headers to ltlenv_HEADERS. + * src/ltlparse/Makefile.am (ltlparsedir, ltlparse_HEADERS): New + variables. + (libltlparse_la_SOURCES): Move all public headers to ltlparse_HEADERS. + * src/ltlvisit/Makefile.am (ltlvisitdir, ltlvisit_HEADERS): New + variables. + (libltlvisit_la_SOURCES): Move all headers to ltlparse_HEADERS. + * src/misc/Makefile.am (include_HEADERS): Rename as .. + (misc_HEADERS): ... this. + (miscdir): New variable. + * src/tgba/Makefile.am (tgbadir, tgba_HEADERS): New variables. + (libtgba_la_SOURCES): Move all headers to tgba_HEADERS. + * src/tgbaalgos/Makefile.am (tgbaalgosdir, tgbaalgos_HEADERS): + New variables. + (libtgbaalgos_la_SOURCES): Move all headers to tgbaalgos_HEADERS. + * src/tgbaparse/Makefile.am (tgbaparsedir, tgbaparse_HEADERS): New + variables. + (libtgbaparse_la_SOURCES): Move all public headers to + tgbaparse_HEADERS. + * src/tgbaparse/public.hh: Include ltlparse/location.hh, not + location.hh. + * doc/Makefile.am (stamp): Prefix $(srcdir) explicitely. * m4/buddy.m4 (BUDDY_LDFLAGS): Use $(top_builddir), not $(top_srcdir). @@ -621,7 +646,7 @@ * Makefile.am (EXTRA_DIST): Add m4/buddy.m4. * configure.ac: Call AX_CHECK_BUDDY. -2003-04-30 Alexandre DURET-LUTZ +2003-04-30 Alexandre Duret-Lutz * src/ltlvisit/Makefile.am (lib_LTLIBRARIES): Rename as ... (noinst_LTLIBRARIES): ... this. @@ -637,7 +662,7 @@ * wrap/spot.i: New file. Preliminary bindings for Python. * configure.ac: Call adl_CHECK_PYTHON and output wrap/Makefile. -2003-04-29 Alexandre DURET-LUTZ +2003-04-29 Alexandre Duret-Lutz * configure.ac: Call AC_PROG_LIBTOOL. * src/ltlast/Makefile.am, src/ltlenv/Makefile.am, @@ -658,7 +683,7 @@ sure we always use paths relative to src/ in src/'s subdirectories. -2003-04-28 Alexandre DURET-LUTZ +2003-04-28 Alexandre Duret-Lutz * src/ltlparse/Makefile.am (CXXFLAGS): Turn on GCC warnings now that CVS Bison is fixed. @@ -671,7 +696,7 @@ * src/ltlvisit/tostring.hh: From ast to string New files. * src/ltlvisit/tostring.cc: From ast to string New files. -2003-04-18 Alexandre DURET-LUTZ +2003-04-18 Alexandre Duret-Lutz * src/ltlparse/Makefile.am (EXTRA_DIST): Distribute ltlparse.yy. * src/ltlast/Makefile.am (libltlast_a_SOURCES): Add visitor.hh. @@ -696,7 +721,7 @@ * src/ltltest/parse.test, src/ltltest/parseerr.test, src/ltltest/equals.test: Use these operators.. -2003-04-17 Alexandre DURET-LUTZ +2003-04-17 Alexandre Duret-Lutz * src/ltltest/readltl.cc, src/ltltest/equals.cc: Cosmetics. @@ -739,7 +764,7 @@ * src/ltlvisit/lunabbrev.hh: Fix include guard. -2003-04-16 Alexandre DURET-LUTZ +2003-04-16 Alexandre Duret-Lutz * src/ltlvisit/tunabbrev.cc, src/ltlvisit/tunabbrev.hh: New files. * src/ltlvisit/Makefile.am (libltlvisit_a_SOURCES): Add them. @@ -797,7 +822,7 @@ same operator, merge its children with ours. * src/ltltest/parseerr.test: Add two tests for multop merging. -2003-04-15 Alexandre DURET-LUTZ +2003-04-15 Alexandre Duret-Lutz * src/ltlast/formulae.hh (formulae::equals): Remove. * src/ltlast/unop.hh (unop::equals): Remove. diff --git a/src/ltlast/Makefile.am b/src/ltlast/Makefile.am index 114e257a7..8cfc0e8be 100644 --- a/src/ltlast/Makefile.am +++ b/src/ltlast/Makefile.am @@ -1,22 +1,27 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -noinst_LTLIBRARIES = libltlast.la -libltlast_la_SOURCES = \ +ltlastdir = $(pkgincludedir)/ltlast + +ltlast_HEADERS = \ allnodes.hh \ - atomic_prop.cc \ atomic_prop.hh \ - binop.cc \ binop.hh \ - constant.cc \ constant.hh \ formula.hh \ - formula.cc \ - multop.cc \ multop.hh \ predecl.hh \ - refformula.cc \ refformula.hh \ - unop.cc \ unop.hh \ visitor.hh + +noinst_LTLIBRARIES = libltlast.la +libltlast_la_SOURCES = \ + atomic_prop.cc \ + binop.cc \ + constant.cc \ + formula.cc \ + multop.cc \ + refformula.cc \ + unop.cc + diff --git a/src/ltlenv/Makefile.am b/src/ltlenv/Makefile.am index 539da1e32..61cb79696 100644 --- a/src/ltlenv/Makefile.am +++ b/src/ltlenv/Makefile.am @@ -1,8 +1,12 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) +ltlenvdir = $(pkgincludedir)/ltlenv + +ltlenv_HEADERS = \ + defaultenv.hh \ + environment.hh + noinst_LTLIBRARIES = libltlenv.la libltlenv_la_SOURCES = \ - defaultenv.cc \ - defaultenv.hh \ - environment.hh \ No newline at end of file + defaultenv.cc \ No newline at end of file diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index 480841865..9d7eeed5c 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) +ltlparsedir = $(pkgincludedir)/ltlparse + noinst_LTLIBRARIES = libltlparse.la LTLPARSE_YY = ltlparse.yy @@ -27,5 +29,9 @@ libltlparse_la_SOURCES = \ fmterror.cc \ $(FROM_LTLPARSE_YY) \ ltlscan.ll \ - parsedecl.hh \ - public.hh + parsedecl.hh + +ltlparse_HEADERS = \ + public.hh \ + location.hh \ + position.hh diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am index fd6761db0..da58208ec 100644 --- a/src/ltlvisit/Makefile.am +++ b/src/ltlvisit/Makefile.am @@ -1,23 +1,27 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) +ltlvisitdir = $(pkgincludedir)/ltlvisit + +ltlvisit_HEADERS = \ + clone.hh \ + destroy.hh \ + dotty.hh \ + dump.hh \ + tostring.hh \ + lunabbrev.hh \ + nenoform.hh \ + postfix.hh \ + tunabbrev.hh + noinst_LTLIBRARIES = libltlvisit.la libltlvisit_la_SOURCES = \ clone.cc \ - clone.hh \ destroy.cc \ - destroy.hh \ dotty.cc \ - dotty.hh \ dump.cc \ - dump.hh \ tostring.cc \ - tostring.hh \ - lunabbrev.hh \ lunabbrev.cc \ - nenoform.hh \ nenoform.cc \ - postfix.hh \ postfix.cc \ - tunabbrev.hh \ tunabbrev.cc diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index f90599a76..af56982b2 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -1,2 +1,2 @@ - -include_HEADERS = const_sel.hh \ No newline at end of file +miscdir = $(pkgincludedir)/misc +misc_HEADERS = const_sel.hh diff --git a/src/tgba/Makefile.am b/src/tgba/Makefile.am index 1f968410b..fd3122af7 100644 --- a/src/tgba/Makefile.am +++ b/src/tgba/Makefile.am @@ -1,40 +1,45 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) +tgbadir = $(pkgincludedir)/tgba + +tgba_HEADERS = \ + bddfactory.hh \ + bddprint.hh \ + dictunion.hh \ + ltl2tgba.hh \ + public.hh \ + state.hh \ + statebdd.hh \ + succiter.hh \ + succiterconcrete.hh \ + tgba.hh \ + tgbabddconcrete.hh \ + tgbabddconcretefactory.hh \ + tgbabddconcreteproduct.hh \ + tgbabddcoredata.hh \ + tgbabdddict.hh \ + tgbabddfactory.hh \ + tgbabddtranslatefactory.hh \ + tgbaexplicit.hh \ + tgbaproduct.hh \ + tgbatranslateproxy.hh + noinst_LTLIBRARIES = libtgba.la libtgba_la_SOURCES = \ bddfactory.cc \ - bddfactory.hh \ bddprint.cc \ - bddprint.hh \ dictunion.cc \ - dictunion.hh \ ltl2tgba.cc \ - ltl2tgba.hh \ - public.hh \ - state.hh \ statebdd.cc \ - statebdd.hh \ - succiter.hh \ succiterconcrete.cc \ - succiterconcrete.hh \ - tgba.hh \ tgbabddconcrete.cc \ - tgbabddconcrete.hh \ tgbabddconcretefactory.cc \ - tgbabddconcretefactory.hh \ tgbabddconcreteproduct.cc \ - tgbabddconcreteproduct.hh \ tgbabddcoredata.cc \ - tgbabddcoredata.hh \ tgbabdddict.cc \ - tgbabdddict.hh \ - tgbabddfactory.hh \ tgbabddtranslatefactory.cc \ - tgbabddtranslatefactory.hh \ tgbaexplicit.cc \ - tgbaexplicit.hh \ tgbaproduct.cc \ - tgbaproduct.hh \ - tgbatranslateproxy.cc \ - tgbatranslateproxy.hh + tgbatranslateproxy.cc + diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am index 95d9f612d..1df3e70e5 100644 --- a/src/tgbaalgos/Makefile.am +++ b/src/tgbaalgos/Makefile.am @@ -1,9 +1,13 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) +tgbaalgosdir = $(pkgincludedir)/tgbaalgos + +tgbaalgos_HEADERS = \ + dotty.hh \ + save.hh + noinst_LTLIBRARIES = libtgbaalgos.la libtgbaalgos_la_SOURCES = \ dotty.cc \ - dotty.hh \ - save.cc \ - save.hh + save.cc diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am index a553ce753..cbe03b8ee 100644 --- a/src/tgbaparse/Makefile.am +++ b/src/tgbaparse/Makefile.am @@ -1,6 +1,11 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS) +tgbaparsedir = $(pkgincludedir)/tgbaparse + +tgbaparse_HEADERS = \ + public.hh + noinst_LTLIBRARIES = libtgbaparse.la TGBAPARSE_YY = tgbaparse.yy @@ -10,6 +15,7 @@ FROM_TGBAPARSE_YY_OTHERS = \ position.hh \ location.hh \ tgbaparse.hh + FROM_TGBAPARSE_YY = $(FROM_TGBAPARSE_YY_MAIN) $(FROM_TGBAPARSE_YY_OTHERS) BUILT_SOURCES = $(FROM_TGBAPARSE_YY) @@ -27,5 +33,4 @@ libtgbaparse_la_SOURCES = \ fmterror.cc \ $(FROM_TGBAPARSE_YY) \ tgbascan.ll \ - parsedecl.hh \ - public.hh + parsedecl.hh diff --git a/src/tgbaparse/public.hh b/src/tgbaparse/public.hh index 1aca404db..924ba1cea 100644 --- a/src/tgbaparse/public.hh +++ b/src/tgbaparse/public.hh @@ -2,7 +2,7 @@ # define SPOT_TGBAPARSE_PUBLIC_HH # include "tgba/tgbaexplicit.hh" -# include "location.hh" +# include "ltlparse/location.hh" # include "ltlenv/defaultenv.hh" # include # include