olena: olena-2.0-802-g639694a Regen Scribo's unit-tests.mk. - Olena-patches

11 Sep 2013

* tests/unit_test/unit-tests.mk: Regen.
---
 scribo/ChangeLog                     |    6 ++
 scribo/tests/unit_test/unit-tests.mk |  166 ++++++++++++++++++----------------
 2 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 96def1c..5536677 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-11  Roland Levillain  &lt;roland(a)lrde.epita.fr&gt;
+
+	Regen Scribo's unit-tests.mk.
+
+	* tests/unit_test/unit-tests.mk: Regen.
+
 2013-09-10  Roland Levillain  &lt;roland(a)lrde.epita.fr&gt;
 
 	Scribo: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's.
diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk
index 82d7b99..f3028b4 100644
--- a/scribo/tests/unit_test/unit-tests.mk
+++ b/scribo/tests/unit_test/unit-tests.mk
@@ -33,60 +33,60 @@ scribo_primitive_extract_non_text_hdoc \
 scribo_primitive_extract_non_text_kmean \
 scribo_text_extract_lines_wo_merge
 
-scribo_core_document_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_core_document_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_core_internal_doc_serializer_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_core_internal_doc_serializer_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_debug_text_color_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_debug_text_color_image_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_images_in_paragraph_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_images_in_paragraph_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_paragraphs_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_paragraphs_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_paragraphs_in_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_paragraphs_in_image_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_separators_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_separators_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_separators_in_element_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_separators_in_element_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_separators_in_paragraph_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_separators_in_paragraph_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_filter_separators_vert_in_borders_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_filter_separators_vert_in_borders_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_img_internal_debug_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_io_img_internal_debug_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_img_internal_full_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_io_img_internal_full_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_img_internal_non_text_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_img_internal_non_text_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_img_internal_text_img_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_io_img_internal_text_img_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_img_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_img_save_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_xml_internal_extended_page_xml_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_xml_internal_extended_page_xml_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS} 
${AM_LDFLAGS}
-scribo_io_xml_internal_page_xml_visitor_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_io_xml_internal_page_xml_visitor_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_xml_internal_print_page_preambule_CPPFLAGS= ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_xml_internal_print_page_preambule_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_xml_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_xml_save_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_make_text_blocks_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_make_text_blocks_image_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_make_text_components_image_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_make_text_components_image_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_postprocessing_images_to_drop_capital_CPPFLAGS= ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_postprocessing_images_to_drop_capital_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_primitive_extract_alignments_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_primitive_extract_alignments_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_primitive_extract_non_text_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_primitive_extract_non_text_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_primitive_extract_non_text_hdoc_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_primitive_extract_non_text_hdoc_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_primitive_extract_non_text_kmean_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_primitive_extract_non_text_kmean_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_text_extract_lines_wo_merge_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_text_extract_lines_wo_merge_LDFLAGS= ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
+scribo_core_document_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_core_document_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_core_internal_doc_serializer_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_core_internal_doc_serializer_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_debug_text_color_image_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_debug_text_color_image_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_images_in_paragraph_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_images_in_paragraph_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_paragraphs_in_borders_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_paragraphs_in_borders_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_paragraphs_in_image_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_paragraphs_in_image_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_separators_in_borders_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_separators_in_borders_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_separators_in_element_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_separators_in_element_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_separators_in_paragraph_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_separators_in_paragraph_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_filter_separators_vert_in_borders_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_filter_separators_vert_in_borders_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_img_internal_debug_img_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_io_img_internal_debug_img_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_img_internal_full_img_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_io_img_internal_full_img_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_img_internal_non_text_img_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_img_internal_non_text_img_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_img_internal_text_img_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_io_img_internal_text_img_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_img_save_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_img_save_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_xml_internal_extended_page_xml_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_xml_internal_extended_page_xml_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS)
$(AM_LDFLAGS)
+scribo_io_xml_internal_page_xml_visitor_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_io_xml_internal_page_xml_visitor_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_xml_internal_print_page_preambule_CPPFLAGS = $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_xml_internal_print_page_preambule_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_xml_save_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_xml_save_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_make_text_blocks_image_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_make_text_blocks_image_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_make_text_components_image_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_make_text_components_image_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_postprocessing_images_to_drop_capital_CPPFLAGS = $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_postprocessing_images_to_drop_capital_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_primitive_extract_alignments_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_primitive_extract_alignments_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_primitive_extract_non_text_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_primitive_extract_non_text_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_primitive_extract_non_text_hdoc_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_primitive_extract_non_text_hdoc_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_primitive_extract_non_text_kmean_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_primitive_extract_non_text_kmean_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_text_extract_lines_wo_merge_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_text_extract_lines_wo_merge_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
 endif HAVE_MAGICKXX
 
 # Starting a conditional unit test list.
@@ -96,10 +96,12 @@ check_PROGRAMS +=  \
 scribo_io_xml_internal_full_xml_visitor \
 scribo_io_xml_load
 
-scribo_io_xml_internal_full_xml_visitor_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT
${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_xml_internal_full_xml_visitor_LDFLAGS= ${QT_LDFLAGS}  ${MAGICKXX_LDFLAGS} 
${AM_LDFLAGS}
-scribo_io_xml_load_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_io_xml_load_LDFLAGS= ${QT_LDFLAGS}  ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
+scribo_io_xml_internal_full_xml_visitor_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT
$(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_xml_internal_full_xml_visitor_LDFLAGS = $(QT_LDFLAGS) $(MAGICKXX_LDFLAGS)
$(AM_LDFLAGS)
+scribo_io_xml_internal_full_xml_visitor_LDADD = $(QT_LIBS) $(LDADD)
+scribo_io_xml_load_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_io_xml_load_LDFLAGS = $(QT_LDFLAGS) $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_xml_load_LDADD = $(QT_LIBS) $(LDADD)
 endif HAVE_QT
 endif HAVE_MAGICKXX
 
@@ -111,8 +113,9 @@ if HAVE_TIFF
 check_PROGRAMS +=  \
 scribo_toolchain_nepomuk_text_extraction
 
-scribo_toolchain_nepomuk_text_extraction_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF
${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${QT_CPPFLAGS} -DHAVE_QT ${MAGICKXX_CPPFLAGS}
-DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_toolchain_nepomuk_text_extraction_LDFLAGS= ${TIFF_LDFLAGS}  ${TESSERACT_LDFLAGS} 
${QT_LDFLAGS}  ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
+scribo_toolchain_nepomuk_text_extraction_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF
$(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT $(QT_CPPFLAGS) -DHAVE_QT $(MAGICKXX_CPPFLAGS)
-DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_toolchain_nepomuk_text_extraction_LDFLAGS = $(TIFF_LDFLAGS) $(TESSERACT_LDFLAGS)
$(QT_LDFLAGS) $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_toolchain_nepomuk_text_extraction_LDADD = $(QT_LIBS) $(LDADD)
 endif HAVE_TIFF
 endif HAVE_TESSERACT
 endif HAVE_QT
@@ -125,10 +128,10 @@ check_PROGRAMS +=  \
 scribo_toolchain_content_in_hdoc \
 scribo_toolchain_internal_content_in_hdoc_functor
 
-scribo_toolchain_content_in_hdoc_CPPFLAGS= ${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT
${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_toolchain_content_in_hdoc_LDFLAGS= ${TESSERACT_LDFLAGS}  ${MAGICKXX_LDFLAGS} 
${AM_LDFLAGS}
-scribo_toolchain_internal_content_in_hdoc_functor_CPPFLAGS= ${TESSERACT_CPPFLAGS}
-DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS}
-scribo_toolchain_internal_content_in_hdoc_functor_LDFLAGS= ${TESSERACT_LDFLAGS} 
${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
+scribo_toolchain_content_in_hdoc_CPPFLAGS = $(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT
$(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_toolchain_content_in_hdoc_LDFLAGS = $(TESSERACT_LDFLAGS) $(MAGICKXX_LDFLAGS)
$(AM_LDFLAGS)
+scribo_toolchain_internal_content_in_hdoc_functor_CPPFLAGS = $(TESSERACT_CPPFLAGS)
-DHAVE_TESSERACT $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS)
+scribo_toolchain_internal_content_in_hdoc_functor_LDFLAGS = $(TESSERACT_LDFLAGS)
$(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
 endif HAVE_TESSERACT
 endif HAVE_MAGICKXX
 
@@ -140,10 +143,10 @@ check_PROGRAMS +=  \
 scribo_toolchain_content_in_doc \
 scribo_toolchain_internal_content_in_doc_functor
 
-scribo_toolchain_content_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF
${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_toolchain_content_in_doc_LDFLAGS= ${TIFF_LDFLAGS}  ${TESSERACT_LDFLAGS} 
${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
-scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF
${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX
${AM_CPPFLAGS}
-scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} 
${TESSERACT_LDFLAGS}  ${MAGICKXX_LDFLAGS}  ${AM_LDFLAGS}
+scribo_toolchain_content_in_doc_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF
$(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_toolchain_content_in_doc_LDFLAGS = $(TIFF_LDFLAGS) $(TESSERACT_LDFLAGS)
$(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
+scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF
$(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX
$(AM_CPPFLAGS)
+scribo_toolchain_internal_content_in_doc_functor_LDFLAGS = $(TIFF_LDFLAGS)
$(TESSERACT_LDFLAGS) $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS)
 endif HAVE_TIFF
 endif HAVE_TESSERACT
 endif HAVE_MAGICKXX
@@ -155,12 +158,15 @@ scribo_convert_from_base64 \
 scribo_convert_from_qimage \
 scribo_io_xml_internal_save_image_to_xml
 
-scribo_convert_from_base64_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS}
-scribo_convert_from_base64_LDFLAGS= ${QT_LDFLAGS}  ${AM_LDFLAGS}
-scribo_convert_from_qimage_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS}
-scribo_convert_from_qimage_LDFLAGS= ${QT_LDFLAGS}  ${AM_LDFLAGS}
-scribo_io_xml_internal_save_image_to_xml_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT
${AM_CPPFLAGS}
-scribo_io_xml_internal_save_image_to_xml_LDFLAGS= ${QT_LDFLAGS}  ${AM_LDFLAGS}
+scribo_convert_from_base64_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT $(AM_CPPFLAGS)
+scribo_convert_from_base64_LDFLAGS = $(QT_LDFLAGS) $(AM_LDFLAGS)
+scribo_convert_from_base64_LDADD = $(QT_LIBS) $(LDADD)
+scribo_convert_from_qimage_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT $(AM_CPPFLAGS)
+scribo_convert_from_qimage_LDFLAGS = $(QT_LDFLAGS) $(AM_LDFLAGS)
+scribo_convert_from_qimage_LDADD = $(QT_LIBS) $(LDADD)
+scribo_io_xml_internal_save_image_to_xml_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT
$(AM_CPPFLAGS)
+scribo_io_xml_internal_save_image_to_xml_LDFLAGS = $(QT_LDFLAGS) $(AM_LDFLAGS)
+scribo_io_xml_internal_save_image_to_xml_LDADD = $(QT_LIBS) $(LDADD)
 endif HAVE_QT
 
 # Starting a conditional unit test list.
@@ -171,12 +177,12 @@ scribo_text_recognition \
 scribo_toolchain_internal_text_in_doc_functor \
 scribo_toolchain_text_in_doc
 
-scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS}
-DHAVE_TESSERACT ${AM_CPPFLAGS}
-scribo_text_recognition_LDFLAGS= ${TIFF_LDFLAGS}  ${TESSERACT_LDFLAGS}  ${AM_LDFLAGS}
-scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF
${TESSERACT_CPPFLAGS} -DHAVE_TESSERACT ${AM_CPPFLAGS}
-scribo_toolchain_internal_text_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} 
${TESSERACT_LDFLAGS}  ${AM_LDFLAGS}
-scribo_toolchain_text_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${TESSERACT_CPPFLAGS}
-DHAVE_TESSERACT ${AM_CPPFLAGS}
-scribo_toolchain_text_in_doc_LDFLAGS= ${TIFF_LDFLAGS}  ${TESSERACT_LDFLAGS} 
${AM_LDFLAGS}
+scribo_text_recognition_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF $(TESSERACT_CPPFLAGS)
-DHAVE_TESSERACT $(AM_CPPFLAGS)
+scribo_text_recognition_LDFLAGS = $(TIFF_LDFLAGS) $(TESSERACT_LDFLAGS) $(AM_LDFLAGS)
+scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF
$(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT $(AM_CPPFLAGS)
+scribo_toolchain_internal_text_in_doc_functor_LDFLAGS = $(TIFF_LDFLAGS)
$(TESSERACT_LDFLAGS) $(AM_LDFLAGS)
+scribo_toolchain_text_in_doc_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF
$(TESSERACT_CPPFLAGS) -DHAVE_TESSERACT $(AM_CPPFLAGS)
+scribo_toolchain_text_in_doc_LDFLAGS = $(TIFF_LDFLAGS) $(TESSERACT_LDFLAGS)
$(AM_LDFLAGS)
 endif HAVE_TIFF
 endif HAVE_TESSERACT
 
-- 
1.7.10.4


    