* Makefile.am, * src/Makefile.am, * src/binarization/Makefile.am, * tests/Makefile.am, * tests/preprocessing/Makefile.am, * tests/unit_test/Makefile.am: new. --- scribo/ChangeLog | 11 ++++++++++ scribo/Makefile.am | 2 +- scribo/src/Makefile.am | 35 +++++++++++++++++++------------ scribo/src/binarization/Makefile.am | 2 +- scribo/tests/Makefile.am | 4 ++- scribo/tests/preprocessing/Makefile.am | 10 +++++++++ scribo/tests/unit_test/Makefile.am | 22 ++++++++++++++++++++ 7 files changed, 69 insertions(+), 17 deletions(-) create mode 100644 scribo/tests/preprocessing/Makefile.am create mode 100644 scribo/tests/unit_test/Makefile.am diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a6a798b..82c4648 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2009-05-25 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Add missing Makefile.am in Scribo. + + * Makefile.am, + * src/Makefile.am, + * src/binarization/Makefile.am, + * tests/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/unit_test/Makefile.am: new. + +2009-05-25 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + Add a script to generate unit tests for scribo. * tests/unit_test/build_unit_test.sh: new. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index bf33f79..98a71f3 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tests +SUBDIRS = tests src .PHONY: bin diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 8511787..72b202d 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -1,36 +1,43 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/milena/sandbox/scribo/scribo.mk +include $(top_srcdir)/scribo/scribo.mk + +recognition_CXXFLAGS = -I$(HOME)/local/include $(HOME)/local/lib/libtesseract_full.a +recognition_LDFLAGS = -lpthread SUBDIRS = \ binarization bin_PROGRAMS = \ dmap \ - extract_text_single_link \ - table_erase \ extract_text_double_link \ - table_extract \ extract_text_double_several_links \ - morpho \ extract_text_graph \ - table_rebuild_opening \ extract_text_several_graph \ - table_rebuild_rank \ extract_text_several_left_links \ - thin_bboxes + extract_text_single_link \ + morpho \ + recognition \ + table_erase \ + table_extract \ + table_rebuild_opening \ + table_rebuild_rank \ + thin_bboxes \ + unskew dmap_SOURCES = dmap.cc -extract_text_single_link_SOURCES = extract_text_single_link.cc -table_erase_SOURCES = table_erase.cc extract_text_double_link_SOURCES = extract_text_double_link.cc -table_extract_SOURCES = table_extract.cc extract_text_double_several_links_SOURCES = extract_text_double_several_links.cc -morpho_SOURCES = morpho.cc extract_text_graph_SOURCES = extract_text_graph.cc -table_rebuild_opening_SOURCES = table_rebuild_opening.cc extract_text_several_graph_SOURCES = extract_text_several_graph.cc -table_rebuild_rank_SOURCES = table_rebuild_rank.cc extract_text_several_left_links_SOURCES = extract_text_several_left_links.cc +extract_text_single_link_SOURCES = extract_text_single_link.cc +morpho_SOURCES = morpho.cc +recognition_SOURCES = recognition.cc +table_erase_SOURCES = table_erase.cc +table_extract_SOURCES = table_extract.cc +table_rebuild_opening_SOURCES = table_rebuild_opening.cc +table_rebuild_rank_SOURCES = table_rebuild_rank.cc thin_bboxes_SOURCES = thin_bboxes.cc +unskew_SOURCES = unskew.cc diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 9f149c7..63eeee7 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/milena/sandbox/scribo/scribo.mk +include $(top_srcdir)/scribo/scribo.mk bin_PROGRAMS = \ simple diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 4f6e663..8646e68 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = \ filter \ + preprocessing \ table \ - text + text \ + unit_test diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am new file mode 100644 index 0000000..eea4429 --- /dev/null +++ b/scribo/tests/preprocessing/Makefile.am @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/scribo/scribo.mk + +check_PROGRAMS = \ + unskew + +unskew_SOURCES = unskew.cc + +TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am new file mode 100644 index 0000000..c0be7d6 --- /dev/null +++ b/scribo/tests/unit_test/Makefile.am @@ -0,0 +1,22 @@ +## Process this file through Automake to create Makefile.in. + +include $(top_srcdir)/scribo/scribo.mk + +.PHONY: regen-tests +regen-tests: $(srcdir)/unit-tests.mk +# FIXME: Change build_unit_test.sh so that the action looks like this: +# +# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# +# `$(abs_top_srcdir)' is required because of the change of directory +# at the beginning og the action. +$(srcdir)/unit-tests.mk: $(srcdir)/build_unit_test.sh + cd $(srcdir) \ + && ./build_unit_test.sh $(abs_top_srcdir)/scribo \ + && chmod a-w unit-tests.mk + +include $(srcdir)/unit-tests.mk + +MAINTAINERCLEANFILES = $(srcdir)/scribo_*.cc + +TESTS = $(check_PROGRAMS) -- 1.5.6.5