[Olena-patches] last-svn-commit-756-gaa2987c tests/unit_test/unit-tests.mk: Regen.

--- scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d6a4b3d..b19115d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. + +2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes * scribo/binarization/sauvola_ms.hh: Add comments. diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 7da6e5c..6a8f29d 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -3,6 +3,20 @@ check_PROGRAMS = # Starting a conditional unit test list. +if HAVE_MAGICKXX +if HAVE_TESSERACT +if HAVE_TIFF +check_PROGRAMS += \ +scribo_toolchain_internal_content_in_doc_functor + +scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc +endif HAVE_TIFF +endif HAVE_TESSERACT +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. if HAVE_QT check_PROGRAMS += \ scribo_convert_from_qimage @@ -31,19 +45,19 @@ if HAVE_TESSERACT if HAVE_TIFF check_PROGRAMS += \ scribo_text_recognition \ -scribo_toolchain_internal_content_in_doc_functor \ scribo_toolchain_internal_text_in_doc_functor \ +scribo_toolchain_content_in_doc \ scribo_toolchain_text_in_doc scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_text_recognition_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_text_recognition_SOURCES = scribo_text_recognition.cc -scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} -scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} -scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_toolchain_internal_text_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_internal_text_in_doc_functor_SOURCES = scribo_toolchain_internal_text_in_doc_functor.cc +scribo_toolchain_content_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_content_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_text_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_toolchain_text_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_text_in_doc_SOURCES = scribo_toolchain_text_in_doc.cc @@ -252,7 +266,6 @@ scribo_text_extract_lines \ scribo_text_link_lines \ scribo_text_look_like_text_lines \ scribo_text_merging \ -scribo_toolchain_content_in_doc \ scribo_toolchain_internal_text_in_doc_preprocess_functor \ scribo_toolchain_internal_toolchain_functor \ scribo_toolchain_text_in_doc_preprocess \ @@ -460,7 +473,6 @@ scribo_text_extract_lines_SOURCES = scribo_text_extract_lines.cc scribo_text_link_lines_SOURCES = scribo_text_link_lines.cc scribo_text_look_like_text_lines_SOURCES = scribo_text_look_like_text_lines.cc scribo_text_merging_SOURCES = scribo_text_merging.cc -scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc -- 1.5.6.5