[Olena-patches] last-svn-commit-552-g656656d Install Scribo headers in include/scribo.

* Makefile.am: Update call to generate_dist_headers.sh. * headers.mk: Regen. --- scribo/ChangeLog | 8 ++++++++ scribo/Makefile.am | 4 ++-- scribo/headers.mk | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3359f5d..3978884 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-08-26 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Install Scribo headers in include/scribo. + + * Makefile.am: Update call to generate_dist_headers.sh. + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * tests/Makefile.am (EXTRA_DIST): Fix path to files. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index b18366b..741cca4 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -29,7 +29,7 @@ REGEN_SUBDIRS += tests regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # @@ -38,6 +38,6 @@ regen-am: $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - scribo headers.mk nodist-headers scribo scribo + scribo headers.mk nodist-headers include $(srcdir)/headers.mk diff --git a/scribo/headers.mk b/scribo/headers.mk index f421f92..30256bb 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -1,6 +1,6 @@ ## Generated by `generate_dist_headers.sh', do not edit by hand. -scribodir = $(includedir)/scribo -nobase_scribo_HEADERS = \ + +nobase_include_HEADERS = \ scribo/all.hh \ scribo/binarization/all.hh \ scribo/binarization/global_threshold.hh \ @@ -201,5 +201,5 @@ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh #<<lrde -nobase_scribo_HEADERS += +nobase_include_HEADERS += #>> -- 1.5.6.5