[Olena-patches] 4371: Fix generation of headers.mk in Scribo.

* scribo/Makefile.am: Add new arguments to generate_dist_headers.sh. * scribo/headers.mk: Update. --- scribo/ChangeLog | 9 +++++++++ scribo/Makefile.am | 4 ++-- scribo/headers.mk | 12 ++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index fc68e94..4cabf03 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2009-08-19 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Fix generation of headers.mk in Scribo. + + * scribo/Makefile.am: Add new arguments to + generate_dist_headers.sh. + + * scribo/headers.mk: Update. + 2009-08-17 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Fix missing qualification for left and right. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 4b1c5a2..3fb05fd 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -30,7 +30,7 @@ REGEN_SUBDIRS += tests regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ - . headers.mk nodist-headers + . headers.mk nodist-headers scribo scribo # FIXME: Change generate_dist_headers.sh so that the action looks like this: # @@ -39,6 +39,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 \ - . headers.mk nodist-headers + . headers.mk nodist-headers scribo scribo include $(srcdir)/headers.mk diff --git a/scribo/headers.mk b/scribo/headers.mk index 382343c..0aa7b35 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -1,6 +1,6 @@ ## Generated by `generate_dist_headers.sh', do not edit by hand. - -nobase_include_HEADERS = \ +scribodir = $(includedir)/scribo +nobase_scribo_HEADERS = \ ./all.hh \ ./binarization/simple.hh \ ./core/all.hh \ @@ -32,9 +32,11 @@ nobase_include_HEADERS = \ ./extract/primitive/objects.hh \ ./filter/all.hh \ ./filter/large_objects.hh \ +./filter/small_object_groups.hh \ ./filter/small_objects.hh \ ./filter/thick_objects.hh \ ./filter/thin_objects.hh \ +./fun/v2b/small_objects_filter.hh \ ./make/all.hh \ ./make/debug_filename.hh \ ./make/influence_zone_graph.hh \ @@ -63,6 +65,7 @@ nobase_include_HEADERS = \ ./text/grouping/group_from_graph.hh \ ./text/grouping/group_from_single_link.hh \ ./text/grouping/group_with_graph.hh \ +./text/grouping/group_with_rag.hh \ ./text/grouping/group_with_several_graphes.hh \ ./text/grouping/group_with_several_left_links.hh \ ./text/grouping/group_with_several_right_links.hh \ @@ -73,6 +76,7 @@ nobase_include_HEADERS = \ ./text/grouping/internal/find_left_link.hh \ ./text/grouping/internal/find_right_link.hh \ ./text/grouping/internal/find_root.hh \ +./text/grouping/internal/have_link_valid.hh \ ./text/grouping/internal/init_link_array.hh \ ./text/grouping/internal/is_link_valid.hh \ ./text/grouping/internal/update_graph_link.hh \ @@ -80,3 +84,7 @@ nobase_include_HEADERS = \ ./text/recognition.hh \ ./util/all.hh \ ./util/text.hh + +#<<lrde +nobase_scribo_HEADERS += +#>> -- 1.5.6.5