* 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.

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
+

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
+  defaultenv.cc 

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

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

src/misc/Makefile.am

@@ -1,2 +1,2 @@
-
-include_HEADERS = const_sel.hh
+miscdir = $(pkgincludedir)/misc
+misc_HEADERS = const_sel.hh

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
+

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

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

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 <string>
 # include <list>