[Olena-patches] olena-2.0-392-g153144d tests/unit_test/unit-tests.mk: Regen.

--- milena/ChangeLog | 4 ++++ milena/tests/unit_test/unit-tests.mk | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a1e5a66..aa4dc0d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Write a valid test for labeling::foreground. * tests/labeling/Makefile.am: Add more extra-dist files. diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d4d0c48..1817969 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -43,7 +43,8 @@ if HAVE_MAGICKXX check_PROGRAMS += \ mln_io_magick_all \ mln_io_magick_load \ -mln_io_magick_save +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} @@ -51,9 +52,23 @@ 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. +if HAVE_POPPLER +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} +endif HAVE_POPPLER + +# Starting a conditional unit test list. if HAVE_QT check_PROGRAMS += \ mln_convert_to_qimage \ @@ -112,7 +127,6 @@ mln_accu_math_count \ mln_accu_math_essential \ mln_accu_math_sum \ mln_accu_math_sumpow \ -mln_accu_math_sup \ mln_accu_max_site \ mln_accu_nil \ mln_accu_p \ @@ -733,8 +747,6 @@ mln_io_pbm_load \ mln_io_pbm_save \ mln_io_pbms_all \ mln_io_pbms_load \ -mln_io_pdf_get_header \ -mln_io_pdf_load \ mln_io_pfm_all \ mln_io_pfm_load \ mln_io_pfm_save \ -- 1.7.2.5