- Olena-patches

olena: branch tests created: olena-2.0-804-g28316a4
by git＠lrde.epita.fr 12 Sep '13

12 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch tests has been created at 28316a4e3eb3b1db62743f2df00d74f930eeeafd (commit) - Log ----------------------------------------------------------------- 28316a4 Exercise the multi-scale Sauvola binarization with a TIFF image. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch version.hh deleted: olena-2.0-795-g8699ea5
by git＠lrde.epita.fr 12 Sep '13

12 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch version.hh has been deleted was 8699ea5d37befe5372b398283d60cc96bf5f289d ----------------------------------------------------------------------- 8699ea5d37befe5372b398283d60cc96bf5f289d Swilena: Remove Milena's build dir from the file inclusion path. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-803-gcefdb20
by git＠lrde.epita.fr 12 Sep '13

12 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via cefdb20740324455e08d9a5da037c9f3024e1909 (commit) via 639694a9ce57682017fd45a3cb37dc84e845cf16 (commit) via 687f9967fdf402b1991c2be45b60222721e77689 (commit) via a6f94b13b8b56f834d0a8241fad1e223d288e8f1 (commit) via 35f4bc0c35b7e596c320b77655ed4ca5133eec0d (commit) via 748696af65992a1aa453978892ba0f4b18417075 (commit) via 8aa7db7833601e75444522502cca8618b89f3948 (commit) via 9e354c74547565ff7d29e8509356725f91a40bbb (commit) from 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 ++ build-aux/build_unit_test.sh | 22 ++- milena/ChangeLog | 20 +++ milena/apps/constrained-connectivity/Makefile.am | 1 - milena/apps/generic-skel/Makefile.am | 1 - milena/apps/graph-morpho/Makefile.am | 2 - milena/apps/mesh-segm-skel/Makefile.am | 1 - milena/apps/morphers/Makefile.am | 1 - milena/apps/papers/levillain.09.ismm/Makefile.am | 1 - milena/tests/tests.mk | 20 --- milena/tests/unit_test/unit-tests.mk | 71 ++++----- milena/tools/tools.mk | 1 - scribo/ChangeLog | 23 +++ scribo/scribo.mk | 3 +- scribo/src/toolchain/nepomuk/Makefile.am | 2 +- scribo/tests/tests.mk | 16 --- scribo/tests/unit_test/unit-tests.mk | 166 +++++++++++----------- swilena/ChangeLog | 7 + swilena/python/Makefile.am | 1 - 19 files changed, 202 insertions(+), 169 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch master updated: olena-2.0-803-gcefdb20
by git＠lrde.epita.fr 12 Sep '13

12 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch master has been updated via cefdb20740324455e08d9a5da037c9f3024e1909 (commit) via 639694a9ce57682017fd45a3cb37dc84e845cf16 (commit) via 687f9967fdf402b1991c2be45b60222721e77689 (commit) via a6f94b13b8b56f834d0a8241fad1e223d288e8f1 (commit) via 35f4bc0c35b7e596c320b77655ed4ca5133eec0d (commit) via 748696af65992a1aa453978892ba0f4b18417075 (commit) via 8aa7db7833601e75444522502cca8618b89f3948 (commit) via 9e354c74547565ff7d29e8509356725f91a40bbb (commit) from 8699ea5d37befe5372b398283d60cc96bf5f289d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 ++ build-aux/build_unit_test.sh | 22 ++- milena/ChangeLog | 20 +++ milena/apps/constrained-connectivity/Makefile.am | 1 - milena/apps/generic-skel/Makefile.am | 1 - milena/apps/graph-morpho/Makefile.am | 2 - milena/apps/mesh-segm-skel/Makefile.am | 1 - milena/apps/morphers/Makefile.am | 1 - milena/apps/papers/levillain.09.ismm/Makefile.am | 1 - milena/tests/tests.mk | 20 --- milena/tests/unit_test/unit-tests.mk | 71 ++++----- milena/tools/tools.mk | 1 - scribo/ChangeLog | 23 +++ scribo/scribo.mk | 3 +- scribo/src/toolchain/nepomuk/Makefile.am | 2 +- scribo/tests/tests.mk | 16 --- scribo/tests/unit_test/unit-tests.mk | 166 +++++++++++----------- swilena/ChangeLog | 7 + swilena/python/Makefile.am | 1 - 19 files changed, 202 insertions(+), 169 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch fixes updated: olena-2.0-803-gcefdb20
by git＠lrde.epita.fr 11 Sep '13

11 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fixes has been updated via cefdb20740324455e08d9a5da037c9f3024e1909 (commit) via 639694a9ce57682017fd45a3cb37dc84e845cf16 (commit) via 687f9967fdf402b1991c2be45b60222721e77689 (commit) via a6f94b13b8b56f834d0a8241fad1e223d288e8f1 (commit) via 35f4bc0c35b7e596c320b77655ed4ca5133eec0d (commit) from 748696af65992a1aa453978892ba0f4b18417075 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- cefdb20 Scribo: Fix the use of QT_LIBS. 639694a Regen Scribo's unit-tests.mk. 687f996 Regen Milena's unit-tests.mk. a6f94b1 Generate more uniform Makefile helpers for unit tests. 35f4bc0 build-aux/build_unit_test.sh: Properly handle QT_LIBS. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 12 +++ build-aux/build_unit_test.sh | 22 ++-- milena/ChangeLog | 6 ++ milena/tests/unit_test/unit-tests.mk | 71 +++++++------ scribo/ChangeLog | 15 +++ scribo/src/toolchain/nepomuk/Makefile.am | 2 +- scribo/tests/unit_test/unit-tests.mk | 166 ++++++++++++++++-------------- 7 files changed, 172 insertions(+), 122 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-803-gcefdb20 Scribo: Fix the use of QT_LIBS.
by Roland Levillain 11 Sep '13

11 Sep '13

* src/toolchain/nepomuk/Makefile.am (text_extraction_LDFLAGS): Move $(QT_LIBS)... (text_extraction_LDADD): ...here. Add $(LDADD). --- scribo/ChangeLog | 9 +++++++++ scribo/src/toolchain/nepomuk/Makefile.am | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5536677..4f33ead 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Scribo: Fix the use of QT_LIBS. + + * src/toolchain/nepomuk/Makefile.am + (text_extraction_LDFLAGS): Move $(QT_LIBS)... + (text_extraction_LDADD): ...here. + Add $(LDADD). + +2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Regen Scribo's unit-tests.mk. * tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/src/toolchain/nepomuk/Makefile.am b/scribo/src/toolchain/nepomuk/Makefile.am index 5d3b252..4d0d942 100644 --- a/scribo/src/toolchain/nepomuk/Makefile.am +++ b/scribo/src/toolchain/nepomuk/Makefile.am @@ -36,8 +36,8 @@ text_extraction_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ $(QT_LDFLAGS) \ - $(QT_LIBS) \ -lpthread +text_extraction_LDADD = $(QT_LIBS) $(LDADD) endif HAVE_TESSERACT endif HAVE_MAGICKXX -- 1.7.10.4

1 0

olena: olena-2.0-802-g639694a Regen Scribo's unit-tests.mk.
by Roland Levillain 11 Sep '13

11 Sep '13

* 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 <roland(a)lrde.epita.fr> + + Regen Scribo's unit-tests.mk. + + * tests/unit_test/unit-tests.mk: Regen. + 2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> 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

1 0

olena: olena-2.0-801-g687f996 Regen Milena's unit-tests.mk.
by Roland Levillain 11 Sep '13

11 Sep '13

* tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 6 +++ milena/tests/unit_test/unit-tests.mk | 71 ++++++++++++++++++---------------- 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f88f452..3536810 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + + Regen Milena's unit-tests.mk. + + * tests/unit_test/unit-tests.mk: Regen. + 2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> Milena: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 72ca7eb..c95e225 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -7,8 +7,8 @@ if HAVE_BOOST_TUPLE check_PROGRAMS += \ mln_accu_tuple -mln_accu_tuple_CPPFLAGS= ${BOOST_TUPLE_CPPFLAGS} -DHAVE_BOOST_TUPLE ${AM_CPPFLAGS} -mln_accu_tuple_LDFLAGS= ${BOOST_TUPLE_LDFLAGS} ${AM_LDFLAGS} +mln_accu_tuple_CPPFLAGS = $(BOOST_TUPLE_CPPFLAGS) -DHAVE_BOOST_TUPLE $(AM_CPPFLAGS) +mln_accu_tuple_LDFLAGS = $(BOOST_TUPLE_LDFLAGS) $(AM_LDFLAGS) endif HAVE_BOOST_TUPLE # Starting a conditional unit test list. @@ -17,10 +17,10 @@ check_PROGRAMS += \ mln_io_fits_all \ mln_io_fits_load -mln_io_fits_all_CPPFLAGS= ${CFITSIO_CPPFLAGS} -DHAVE_CFITSIO ${AM_CPPFLAGS} -mln_io_fits_all_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} -mln_io_fits_load_CPPFLAGS= ${CFITSIO_CPPFLAGS} -DHAVE_CFITSIO ${AM_CPPFLAGS} -mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} +mln_io_fits_all_CPPFLAGS = $(CFITSIO_CPPFLAGS) -DHAVE_CFITSIO $(AM_CPPFLAGS) +mln_io_fits_all_LDFLAGS = $(CFITSIO_LDFLAGS) $(AM_LDFLAGS) +mln_io_fits_load_CPPFLAGS = $(CFITSIO_CPPFLAGS) -DHAVE_CFITSIO $(AM_CPPFLAGS) +mln_io_fits_load_LDFLAGS = $(CFITSIO_LDFLAGS) $(AM_LDFLAGS) endif HAVE_CFITSIO # Starting a conditional unit test list. @@ -28,8 +28,8 @@ if HAVE_FFTW3 check_PROGRAMS += \ mln_transform_fft -mln_transform_fft_CPPFLAGS= ${FFTW3_CPPFLAGS} -DHAVE_FFTW3 ${AM_CPPFLAGS} -mln_transform_fft_LDFLAGS= ${FFTW3_LDFLAGS} ${AM_LDFLAGS} +mln_transform_fft_CPPFLAGS = $(FFTW3_CPPFLAGS) -DHAVE_FFTW3 $(AM_CPPFLAGS) +mln_transform_fft_LDFLAGS = $(FFTW3_LDFLAGS) $(AM_LDFLAGS) endif HAVE_FFTW3 # Starting a conditional unit test list. @@ -39,12 +39,12 @@ mln_io_dicom_all \ mln_io_dicom_load \ mln_io_dicom_get_header -mln_io_dicom_all_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} -mln_io_dicom_all_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} -mln_io_dicom_load_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} -mln_io_dicom_load_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} -mln_io_dicom_get_header_CPPFLAGS= ${GDCM_CPPFLAGS} -DHAVE_GDCM ${AM_CPPFLAGS} -mln_io_dicom_get_header_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS} +mln_io_dicom_all_CPPFLAGS = $(GDCM_CPPFLAGS) -DHAVE_GDCM $(AM_CPPFLAGS) +mln_io_dicom_all_LDFLAGS = $(GDCM_LDFLAGS) $(AM_LDFLAGS) +mln_io_dicom_load_CPPFLAGS = $(GDCM_CPPFLAGS) -DHAVE_GDCM $(AM_CPPFLAGS) +mln_io_dicom_load_LDFLAGS = $(GDCM_LDFLAGS) $(AM_LDFLAGS) +mln_io_dicom_get_header_CPPFLAGS = $(GDCM_CPPFLAGS) -DHAVE_GDCM $(AM_CPPFLAGS) +mln_io_dicom_get_header_LDFLAGS = $(GDCM_LDFLAGS) $(AM_LDFLAGS) endif HAVE_GDCM # Starting a conditional unit test list. @@ -55,14 +55,14 @@ mln_io_magick_load \ mln_io_magick_save \ mln_io_magick_internal_init_magick -mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} -mln_io_magick_all_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} -mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} -mln_io_magick_load_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} -mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} -mln_io_magick_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} -mln_io_magick_internal_init_magick_CPPFLAGS= ${MAGICKXX_CPPFLAGS} -DHAVE_MAGICKXX ${AM_CPPFLAGS} -mln_io_magick_internal_init_magick_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +mln_io_magick_all_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS) +mln_io_magick_all_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS) +mln_io_magick_load_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS) +mln_io_magick_load_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS) +mln_io_magick_save_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS) +mln_io_magick_save_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS) +mln_io_magick_internal_init_magick_CPPFLAGS = $(MAGICKXX_CPPFLAGS) -DHAVE_MAGICKXX $(AM_CPPFLAGS) +mln_io_magick_internal_init_magick_LDFLAGS = $(MAGICKXX_LDFLAGS) $(AM_LDFLAGS) endif HAVE_MAGICKXX # Starting a conditional unit test list. @@ -71,10 +71,10 @@ check_PROGRAMS += \ mln_io_pdf_get_header \ mln_io_pdf_load -mln_io_pdf_get_header_CPPFLAGS= ${POPPLER_CPPFLAGS} -DHAVE_POPPLER ${AM_CPPFLAGS} -mln_io_pdf_get_header_LDFLAGS= ${POPPLER_LDFLAGS} ${AM_LDFLAGS} -mln_io_pdf_load_CPPFLAGS= ${POPPLER_CPPFLAGS} -DHAVE_POPPLER ${AM_CPPFLAGS} -mln_io_pdf_load_LDFLAGS= ${POPPLER_LDFLAGS} ${AM_LDFLAGS} +mln_io_pdf_get_header_CPPFLAGS = $(POPPLER_CPPFLAGS) -DHAVE_POPPLER $(AM_CPPFLAGS) +mln_io_pdf_get_header_LDFLAGS = $(POPPLER_LDFLAGS) $(AM_LDFLAGS) +mln_io_pdf_load_CPPFLAGS = $(POPPLER_CPPFLAGS) -DHAVE_POPPLER $(AM_CPPFLAGS) +mln_io_pdf_load_LDFLAGS = $(POPPLER_LDFLAGS) $(AM_LDFLAGS) endif HAVE_POPPLER # Starting a conditional unit test list. @@ -83,10 +83,12 @@ check_PROGRAMS += \ mln_convert_to_qimage \ mln_convert_to_qimage_nocopy -mln_convert_to_qimage_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} -mln_convert_to_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} -mln_convert_to_qimage_nocopy_CPPFLAGS= ${QT_CPPFLAGS} -DHAVE_QT ${AM_CPPFLAGS} -mln_convert_to_qimage_nocopy_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +mln_convert_to_qimage_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT $(AM_CPPFLAGS) +mln_convert_to_qimage_LDFLAGS = $(QT_LDFLAGS) $(AM_LDFLAGS) +mln_convert_to_qimage_LDADD = $(QT_LIBS) $(LDADD) +mln_convert_to_qimage_nocopy_CPPFLAGS = $(QT_CPPFLAGS) -DHAVE_QT $(AM_CPPFLAGS) +mln_convert_to_qimage_nocopy_LDFLAGS = $(QT_LDFLAGS) $(AM_LDFLAGS) +mln_convert_to_qimage_nocopy_LDADD = $(QT_LIBS) $(LDADD) endif HAVE_QT # Starting a conditional unit test list. @@ -95,10 +97,10 @@ check_PROGRAMS += \ mln_io_tiff_all \ mln_io_tiff_load -mln_io_tiff_all_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${AM_CPPFLAGS} -mln_io_tiff_all_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} -mln_io_tiff_load_CPPFLAGS= ${TIFF_CPPFLAGS} -DHAVE_TIFF ${AM_CPPFLAGS} -mln_io_tiff_load_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS} +mln_io_tiff_all_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF $(AM_CPPFLAGS) +mln_io_tiff_all_LDFLAGS = $(TIFF_LDFLAGS) $(AM_LDFLAGS) +mln_io_tiff_load_CPPFLAGS = $(TIFF_CPPFLAGS) -DHAVE_TIFF $(AM_CPPFLAGS) +mln_io_tiff_load_LDFLAGS = $(TIFF_LDFLAGS) $(AM_LDFLAGS) endif HAVE_TIFF # Starting non-conditional unit test list. @@ -1344,6 +1346,7 @@ mln_value_sign \ mln_value_super_value \ mln_value_value_array \ mln_value_viter \ +mln_version \ mln_win_all \ mln_win_backdiag2d \ mln_win_ball \ -- 1.7.10.4

1 0

olena: olena-2.0-800-ga6f94b1 Generate more uniform Makefile helpers for unit tests.
by Roland Levillain 11 Sep '13

11 Sep '13

* build-aux/build_unit_test.sh: Write Make variables with parentheses instead of braces. Add a space before `='. --- ChangeLog | 8 ++++++++ build-aux/build_unit_test.sh | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 154b20b..b366f8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Generate more uniform Makefile helpers for unit tests. + + * build-aux/build_unit_test.sh: Write Make variables with + parentheses instead of braces. + Add a space before `='. + +2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + * build-aux/build_unit_test.sh: Properly handle QT_LIBS. 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 7f4748f..7b06879 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -112,20 +112,20 @@ EOF # Write specific flags if there are dependencies. if ! (test -z "$IFDEF"); then - cppflags="${NAME}_CPPFLAGS=" - ldflags="${NAME}_LDFLAGS=" + cppflags="${NAME}_CPPFLAGS =" + ldflags="${NAME}_LDFLAGS =" for i in $IFDEF; do - cppflags="${cppflags} \${${i}_CPPFLAGS} -DHAVE_${i}" - ldflags="${ldflags} \${${i}_LDFLAGS} " + cppflags="${cppflags} \$(${i}_CPPFLAGS) -DHAVE_${i}" + ldflags="${ldflags} \$(${i}_LDFLAGS)" done - echo "$cppflags \${AM_CPPFLAGS}" >>"$output" - echo "$ldflags \${AM_LDFLAGS}" >>"$output" + echo "$cppflags \$(AM_CPPFLAGS)" >>"$output" + echo "$ldflags \$(AM_LDFLAGS)" >>"$output" # Local hack: Handle the special case of Qt, which defines # QT_LIBS, to be use for with ${NAME}_LDADD variables. for i in $IFDEF; do if test "x$i" = xQT; then - echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output" + echo "${NAME}_LDADD = \$(QT_LIBS) \$(LDADD)" >>"$output" fi done fi -- 1.7.10.4

1 0

olena: olena-2.0-799-g35f4bc0 build-aux/build_unit_test.sh: Properly handle QT_LIBS.
by Roland Levillain 11 Sep '13

11 Sep '13

--- ChangeLog | 4 ++++ build-aux/build_unit_test.sh | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ba84a7b..154b20b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> + + * build-aux/build_unit_test.sh: Properly handle QT_LIBS. + 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> Olena: Remove Milena's build dir from the file inclusion path. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 6623c01..7f4748f 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory # (LRDE) # # This file is part of Olena. @@ -120,6 +120,14 @@ EOF done echo "$cppflags \${AM_CPPFLAGS}" >>"$output" echo "$ldflags \${AM_LDFLAGS}" >>"$output" + + # Local hack: Handle the special case of Qt, which defines + # QT_LIBS, to be use for with ${NAME}_LDADD variables. + for i in $IFDEF; do + if test "x$i" = xQT; then + echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output" + fi + done fi done -- 1.7.10.4

1 0