X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=Makefile.in;h=6f3e05bc2e7336df06aa24cc811b675762874436;hb=73e9fd72713d65af9d7f995d216ec7ca193b2d59;hp=9cee0b5a1b5ee7464ae5cc1d00f53e836c6bc513;hpb=ec6934f072791fce1ca420e109a30975be366be6;p=imagemagick diff --git a/Makefile.in b/Makefile.in index 9cee0b5a1..6f3e05bc2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -231,9 +231,9 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ bin_PROGRAMS = $(am__EXEEXT_1) -TESTS = $(TESTS_TESTS) $(am__EXEEXT_6) $(MAGICKWAND_TESTS) -XFAIL_TESTS = $(am__EXEEXT_7) $(am__EXEEXT_7) -check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_5) +TESTS = $(TESTS_TESTS) $(am__EXEEXT_5) +XFAIL_TESTS = $(am__EXEEXT_6) $(am__EXEEXT_6) +check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \ $(am__configure_deps) $(am__include_HEADERS_DIST) \ $(am__ltdlinclude_HEADERS_DIST) \ @@ -243,10 +243,11 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \ $(srcdir)/MagickCore/Makefile.am \ $(srcdir)/MagickWand/Makefile.am $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/PerlMagick/Makefile.am \ - $(srcdir)/coders/Makefile.am $(srcdir)/config/Makefile.am \ - $(srcdir)/filters/Makefile.am $(srcdir)/ltdl/Makefile.inc \ - $(srcdir)/m4/Makefile.am $(srcdir)/magick.sh.in \ - $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \ + $(srcdir)/coders/Makefile.am $(srcdir)/common.shi.in \ + $(srcdir)/config/Makefile.am $(srcdir)/filters/Makefile.am \ + $(srcdir)/ltdl/Makefile.inc $(srcdir)/m4/Makefile.am \ + $(srcdir)/magick.sh.in $(srcdir)/tests/Makefile.am \ + $(srcdir)/utilities/Makefile.am \ $(top_srcdir)/Magick++/bin/Magick++-config.in \ $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \ $(top_srcdir)/Magick++/lib/Magick++.pc.in \ @@ -260,6 +261,7 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \ $(top_srcdir)/PerlMagick/Makefile.PL.in \ $(top_srcdir)/PerlMagick/check.sh.in \ $(top_srcdir)/config/ImageMagick.rdf.in \ + $(top_srcdir)/config/Magick++.dox.in \ $(top_srcdir)/config/MagickCore.dox.in \ $(top_srcdir)/config/MagickWand.dox.in \ $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ @@ -270,6 +272,7 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \ $(top_srcdir)/config/depcomp $(top_srcdir)/config/install-sh \ $(top_srcdir)/config/ltmain.sh $(top_srcdir)/config/missing \ $(top_srcdir)/config/mkinstalldirs \ + $(top_srcdir)/config/tap-driver.sh \ $(top_srcdir)/config/test-driver \ $(top_srcdir)/config/type-dejavu.xml.in \ $(top_srcdir)/config/type-ghostscript.xml.in \ @@ -306,6 +309,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \ $(top_srcdir)/m4/ax_cxx_namespaces.m4 \ $(top_srcdir)/m4/ax_gcc_archflag.m4 \ $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \ + $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ $(top_srcdir)/m4/ax_opencl.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/ax_prog_perl_version.m4 \ @@ -324,9 +328,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config/config.h -CONFIG_CLEAN_FILES = config/configure.xml config/delegates.xml \ - config/ImageMagick.rdf config/MagickCore.dox \ - config/MagickWand.dox config/type-dejavu.xml \ +CONFIG_CLEAN_FILES = common.shi config/configure.xml \ + config/delegates.xml config/ImageMagick.rdf \ + config/MagickCore.dox config/MagickWand.dox \ + config/Magick++.dox config/type-dejavu.xml \ config/type-ghostscript.xml config/type-windows.xml \ config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \ MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc \ @@ -847,7 +852,7 @@ coders_braille_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_braille_la_LDFLAGS) $(LDFLAGS) \ -o $@ @WITH_MODULES_TRUE@am_coders_braille_la_rpath = -rpath $(codersdir) -coders_cals_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_cals_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) am_coders_cals_la_OBJECTS = coders/coders_cals_la-cals.lo coders_cals_la_OBJECTS = $(am_coders_cals_la_OBJECTS) coders_cals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -855,7 +860,8 @@ coders_cals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_cals_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_cals_la_rpath = -rpath $(codersdir) -coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ + $(am__DEPENDENCIES_1) am_coders_caption_la_OBJECTS = coders/coders_caption_la-caption.lo coders_caption_la_OBJECTS = $(am_coders_caption_la_OBJECTS) coders_caption_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -911,7 +917,7 @@ coders_cut_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_cut_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_cut_la_rpath = -rpath $(codersdir) -coders_dcm_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_dcm_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) am_coders_dcm_la_OBJECTS = coders/coders_dcm_la-dcm.lo coders_dcm_la_OBJECTS = $(am_coders_dcm_la_OBJECTS) coders_dcm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -942,7 +948,7 @@ coders_dib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_MODULES_TRUE@am_coders_dib_la_rpath = -rpath $(codersdir) coders_djvu_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_coders_djvu_la_OBJECTS = coders/coders_djvu_la-djvu.lo coders_djvu_la_OBJECTS = $(am_coders_djvu_la_OBJECTS) coders_djvu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1067,14 +1073,16 @@ coders_hald_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(coders_hald_la_LDFLAGS) $(LDFLAGS) -o \ $@ @WITH_MODULES_TRUE@am_coders_hald_la_rpath = -rpath $(codersdir) -coders_hdr_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +coders_hdr_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_hdr_la_OBJECTS = coders/coders_hdr_la-hdr.lo coders_hdr_la_OBJECTS = $(am_coders_hdr_la_OBJECTS) coders_hdr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_hdr_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_hdr_la_rpath = -rpath $(codersdir) -coders_histogram_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_histogram_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ + $(am__DEPENDENCIES_1) am_coders_histogram_la_OBJECTS = \ coders/coders_histogram_la-histogram.lo coders_histogram_la_OBJECTS = $(am_coders_histogram_la_OBJECTS) @@ -1154,7 +1162,8 @@ coders_jp2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(coders_jp2_la_LDFLAGS) $(LDFLAGS) -o $@ @JP2_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_jp2_la_rpath = -rpath \ @JP2_DELEGATE_TRUE@@WITH_MODULES_TRUE@ $(codersdir) -coders_jpeg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) +coders_jpeg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_jpeg_la_OBJECTS = coders/coders_jpeg_la-jpeg.lo coders_jpeg_la_OBJECTS = $(am_coders_jpeg_la_OBJECTS) coders_jpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1163,7 +1172,8 @@ coders_jpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $@ @JPEG_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_jpeg_la_rpath = \ @JPEG_DELEGATE_TRUE@@WITH_MODULES_TRUE@ -rpath $(codersdir) -coders_label_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_label_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ + $(am__DEPENDENCIES_1) am_coders_label_la_OBJECTS = coders/coders_label_la-label.lo coders_label_la_OBJECTS = $(am_coders_label_la_OBJECTS) coders_label_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1272,7 +1282,7 @@ coders_mtv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_mtv_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_mtv_la_rpath = -rpath $(codersdir) -coders_mvg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_mvg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) am_coders_mvg_la_OBJECTS = coders/coders_mvg_la-mvg.lo coders_mvg_la_OBJECTS = $(am_coders_mvg_la_OBJECTS) coders_mvg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1326,7 +1336,7 @@ coders_pcd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_pcd_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_pcd_la_rpath = -rpath $(codersdir) -coders_pcl_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_pcl_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) am_coders_pcl_la_OBJECTS = coders/coders_pcl_la-pcl.lo coders_pcl_la_OBJECTS = $(am_coders_pcl_la_OBJECTS) coders_pcl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1552,7 +1562,8 @@ coders_thumbnail_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_MODULES_TRUE@am_coders_thumbnail_la_rpath = -rpath $(codersdir) coders_tiff_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_coders_tiff_la_OBJECTS = coders/coders_tiff_la-tiff.lo coders_tiff_la_OBJECTS = $(am_coders_tiff_la_OBJECTS) coders_tiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1708,7 +1719,7 @@ coders_xpm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_xpm_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_xpm_la_rpath = -rpath $(codersdir) -coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) am_coders_xps_la_OBJECTS = coders/coders_xps_la-xps.lo coders_xps_la_OBJECTS = $(am_coders_xps_la_OBJECTS) coders_xps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1818,7 +1829,8 @@ am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \ utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \ utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \ utilities/stream$(EXEEXT) -am__EXEEXT_2 = tests/validate$(EXEEXT) +am__EXEEXT_2 = tests/validate$(EXEEXT) tests/drawtest$(EXEEXT) \ + tests/wandtest$(EXEEXT) am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \ Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \ Magick++/demo/detrans$(EXEEXT) Magick++/demo/flip$(EXEEXT) \ @@ -1837,113 +1849,115 @@ am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \ Magick++/tests/readWriteBlob$(EXEEXT) \ Magick++/tests/readWriteImages$(EXEEXT) @WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3) -am__EXEEXT_5 = MagickWand/drawtest$(EXEEXT) \ - MagickWand/wandtest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_Magick___demo_analyze_OBJECTS = Magick++/demo/analyze.$(OBJEXT) Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS) @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_3 = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ Magick++/lib/libMagick++.la -Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_3) +@WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_4 = \ +@WITH_MAGICK_PLUS_PLUS_TRUE@ $(am__DEPENDENCIES_3) \ +@WITH_MAGICK_PLUS_PLUS_TRUE@ $(top_builddir)/MagickCore/libMagickCore.la +Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_button_OBJECTS = Magick++/demo/button.$(OBJEXT) Magick___demo_button_OBJECTS = $(am_Magick___demo_button_OBJECTS) -Magick___demo_button_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_button_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_demo_OBJECTS = Magick++/demo/demo.$(OBJEXT) Magick___demo_demo_OBJECTS = $(am_Magick___demo_demo_OBJECTS) -Magick___demo_demo_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_demo_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_detrans_OBJECTS = Magick++/demo/detrans.$(OBJEXT) Magick___demo_detrans_OBJECTS = $(am_Magick___demo_detrans_OBJECTS) -Magick___demo_detrans_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_detrans_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_flip_OBJECTS = Magick++/demo/flip.$(OBJEXT) Magick___demo_flip_OBJECTS = $(am_Magick___demo_flip_OBJECTS) -Magick___demo_flip_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_flip_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_gravity_OBJECTS = Magick++/demo/gravity.$(OBJEXT) Magick___demo_gravity_OBJECTS = $(am_Magick___demo_gravity_OBJECTS) -Magick___demo_gravity_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_gravity_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_piddle_OBJECTS = Magick++/demo/piddle.$(OBJEXT) Magick___demo_piddle_OBJECTS = $(am_Magick___demo_piddle_OBJECTS) -Magick___demo_piddle_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_piddle_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_shapes_OBJECTS = Magick++/demo/shapes.$(OBJEXT) Magick___demo_shapes_OBJECTS = $(am_Magick___demo_shapes_OBJECTS) -Magick___demo_shapes_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_shapes_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___demo_zoom_OBJECTS = Magick++/demo/zoom.$(OBJEXT) Magick___demo_zoom_OBJECTS = $(am_Magick___demo_zoom_OBJECTS) -Magick___demo_zoom_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___demo_zoom_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_appendImages_OBJECTS = \ Magick++/tests/appendImages.$(OBJEXT) Magick___tests_appendImages_OBJECTS = \ $(am_Magick___tests_appendImages_OBJECTS) -Magick___tests_appendImages_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_appendImages_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_attributes_OBJECTS = \ Magick++/tests/attributes.$(OBJEXT) Magick___tests_attributes_OBJECTS = \ $(am_Magick___tests_attributes_OBJECTS) -Magick___tests_attributes_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_attributes_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_averageImages_OBJECTS = \ Magick++/tests/averageImages.$(OBJEXT) Magick___tests_averageImages_OBJECTS = \ $(am_Magick___tests_averageImages_OBJECTS) -Magick___tests_averageImages_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_averageImages_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_coalesceImages_OBJECTS = \ Magick++/tests/coalesceImages.$(OBJEXT) Magick___tests_coalesceImages_OBJECTS = \ $(am_Magick___tests_coalesceImages_OBJECTS) -Magick___tests_coalesceImages_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_coalesceImages_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_coderInfo_OBJECTS = \ Magick++/tests/coderInfo.$(OBJEXT) Magick___tests_coderInfo_OBJECTS = \ $(am_Magick___tests_coderInfo_OBJECTS) -Magick___tests_coderInfo_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_coderInfo_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_color_OBJECTS = Magick++/tests/color.$(OBJEXT) Magick___tests_color_OBJECTS = $(am_Magick___tests_color_OBJECTS) -Magick___tests_color_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_color_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_colorHistogram_OBJECTS = \ Magick++/tests/colorHistogram.$(OBJEXT) Magick___tests_colorHistogram_OBJECTS = \ $(am_Magick___tests_colorHistogram_OBJECTS) -Magick___tests_colorHistogram_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_colorHistogram_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_exceptions_OBJECTS = \ Magick++/tests/exceptions.$(OBJEXT) Magick___tests_exceptions_OBJECTS = \ $(am_Magick___tests_exceptions_OBJECTS) -Magick___tests_exceptions_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_exceptions_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_montageImages_OBJECTS = \ Magick++/tests/montageImages.$(OBJEXT) Magick___tests_montageImages_OBJECTS = \ $(am_Magick___tests_montageImages_OBJECTS) -Magick___tests_montageImages_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_montageImages_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_morphImages_OBJECTS = \ Magick++/tests/morphImages.$(OBJEXT) Magick___tests_morphImages_OBJECTS = \ $(am_Magick___tests_morphImages_OBJECTS) -Magick___tests_morphImages_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_morphImages_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_readWriteBlob_OBJECTS = \ Magick++/tests/readWriteBlob.$(OBJEXT) Magick___tests_readWriteBlob_OBJECTS = \ $(am_Magick___tests_readWriteBlob_OBJECTS) -Magick___tests_readWriteBlob_DEPENDENCIES = $(am__DEPENDENCIES_3) +Magick___tests_readWriteBlob_DEPENDENCIES = $(am__DEPENDENCIES_4) am_Magick___tests_readWriteImages_OBJECTS = \ Magick++/tests/readWriteImages.$(OBJEXT) Magick___tests_readWriteImages_OBJECTS = \ $(am_Magick___tests_readWriteImages_OBJECTS) -Magick___tests_readWriteImages_DEPENDENCIES = $(am__DEPENDENCIES_3) -am_MagickWand_drawtest_OBJECTS = MagickWand/drawtest.$(OBJEXT) -MagickWand_drawtest_OBJECTS = $(am_MagickWand_drawtest_OBJECTS) -MagickWand_drawtest_DEPENDENCIES = $(MAGICKWAND_LIBS) -MagickWand_drawtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +Magick___tests_readWriteImages_DEPENDENCIES = $(am__DEPENDENCIES_4) +am_tests_drawtest_OBJECTS = tests/drawtest.$(OBJEXT) +tests_drawtest_OBJECTS = $(am_tests_drawtest_OBJECTS) +tests_drawtest_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_drawtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(MagickWand_drawtest_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_MagickWand_wandtest_OBJECTS = MagickWand/wandtest.$(OBJEXT) -MagickWand_wandtest_OBJECTS = $(am_MagickWand_wandtest_OBJECTS) -MagickWand_wandtest_DEPENDENCIES = $(MAGICKWAND_LIBS) -MagickWand_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(MagickWand_wandtest_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(AM_CFLAGS) $(CFLAGS) $(tests_drawtest_LDFLAGS) $(LDFLAGS) -o \ + $@ am_tests_validate_OBJECTS = tests/tests_validate-validate.$(OBJEXT) tests_validate_OBJECTS = $(am_tests_validate_OBJECTS) -tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \ + $(am__DEPENDENCIES_1) +am_tests_wandtest_OBJECTS = tests/wandtest.$(OBJEXT) +tests_wandtest_OBJECTS = $(am_tests_wandtest_OBJECTS) +tests_wandtest_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(tests_wandtest_LDFLAGS) $(LDFLAGS) -o \ + $@ am_utilities_animate_OBJECTS = utilities/animate.$(OBJEXT) utilities_animate_OBJECTS = $(am_utilities_animate_OBJECTS) utilities_animate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) @@ -2161,8 +2175,8 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(Magick___tests_morphImages_SOURCES) \ $(Magick___tests_readWriteBlob_SOURCES) \ $(Magick___tests_readWriteImages_SOURCES) \ - $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \ - $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \ + $(tests_drawtest_SOURCES) $(tests_validate_SOURCES) \ + $(tests_wandtest_SOURCES) $(utilities_animate_SOURCES) \ $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \ $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \ $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \ @@ -2253,8 +2267,8 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(Magick___tests_morphImages_SOURCES) \ $(Magick___tests_readWriteBlob_SOURCES) \ $(Magick___tests_readWriteImages_SOURCES) \ - $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \ - $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \ + $(tests_drawtest_SOURCES) $(tests_validate_SOURCES) \ + $(tests_wandtest_SOURCES) $(utilities_animate_SOURCES) \ $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \ $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \ $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \ @@ -2446,13 +2460,13 @@ am__set_TESTS_bases = \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) -@WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_6 = \ +@WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_5 = \ @WITH_MAGICK_PLUS_PLUS_TRUE@ $(MAGICKPP_TEST_SCRIPTS_OPT) -am__EXEEXT_7 = +am__EXEEXT_6 = TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) +am__test_logs3 = $(am__test_logs2:.sh.log=.log) SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__set_b = \ @@ -2465,6 +2479,9 @@ am__set_b = \ *) \ b='$*';; \ esac +TEST_LOGS = $(am__test_logs3:.tap.log=.log) +TAP_LOG_COMPILE = $(TAP_LOG_COMPILER) $(AM_TAP_LOG_FLAGS) \ + $(TAP_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -2633,8 +2650,6 @@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ LZMA_CFLAGS = @LZMA_CFLAGS@ LZMA_LIBS = @LZMA_LIBS@ -LZWDecodeDelegate = @LZWDecodeDelegate@ -LZWEncodeDelegate = @LZWEncodeDelegate@ LaunchDelegate = @LaunchDelegate@ MAGICKCORE_PATH = @MAGICKCORE_PATH@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ @@ -2659,6 +2674,7 @@ MAGICK_LIB_VERSION = @MAGICK_LIB_VERSION@ MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@ MAGICK_LIB_VERSION_TEXT = @MAGICK_LIB_VERSION_TEXT@ MAGICK_LTDLDEPS = @MAGICK_LTDLDEPS@ +MAGICK_LT_RELEASE_OPTS = @MAGICK_LT_RELEASE_OPTS@ MAGICK_PCFLAGS = @MAGICK_PCFLAGS@ MAGICK_SVN_REVISION = @MAGICK_SVN_REVISION@ MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@ @@ -2895,30 +2911,23 @@ noinst_HEADERS = \ @WIN32_NATIVE_BUILD_FALSE@SRCDIR = "$(srcdir)/" @WIN32_NATIVE_BUILD_TRUE@SRCDIR = '$(shell @WinPathScript@ $(srcdir)/)' +# Tests with .tap extensions use the TAP protocol and TAP driver +LOG_COMPILER = $(SHELL) +SH_LOG_COMPILER = $(LOG_COMPILER) +TAP_LOG_COMPILER = $(LOG_COMPILER) + +# Test extensions +TEST_EXTENSIONS = .sh .tap +TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ + $(top_srcdir)/config/tap-driver.sh + + # Environment parameters to be used during tests TESTS_ENVIRONMENT = \ - COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \ - COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \ - CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \ - CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \ - DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \ - IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \ - MAGICK="$(MEMCHECK) @abs_top_builddir@/utilities/magick" \ - MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \ - VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \ - LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:${LD_LIBRARY_PATH}" \ - MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \ - MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \ - MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \ MAKE="$(MAKE)" \ MAKEFLAGS="$(MAKEFLAGS)" \ - MEMCHECK="$(MEMCHECK)" \ - PATH="@abs_top_builddir@/utilities:${PATH}" \ - SRCDIR=$(SRCDIR) + MEMCHECK="$(MEMCHECK)" - -# Test extensions -TEST_EXTENSIONS = .sh TOP_EXTRA_DIST = \ AUTHORS.txt \ ChangeLog \ @@ -3023,6 +3032,7 @@ CONFIG_EXTRA_DIST = \ config/delegates.xml.in \ config/english.xml \ config/francais.xml \ + config/ImageMagick.rc \ config/ImageMagick.rdf.in \ config/lndir.sh \ config/locale.xml \ @@ -3393,13 +3403,13 @@ coders_braille_la_LIBADD = $(MAGICKCORE_LIBS) coders_cals_la_SOURCES = coders/cals.c coders_cals_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_cals_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_cals_la_LIBADD = $(MAGICKCORE_LIBS) +coders_cals_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # CAPTION coder module coders_caption_la_SOURCES = coders/caption.c coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_caption_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_caption_la_LIBADD = $(MAGICKCORE_LIBS) +coders_caption_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # CINEON coder module coders_cin_la_SOURCES = coders/cin.c @@ -3441,7 +3451,7 @@ coders_cut_la_LIBADD = $(MAGICKCORE_LIBS) coders_dcm_la_SOURCES = coders/dcm.c coders_dcm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_dcm_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_dcm_la_LIBADD = $(MAGICKCORE_LIBS) +coders_dcm_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # DDS coder module coders_dds_la_SOURCES = coders/dds.c @@ -3465,7 +3475,7 @@ coders_dib_la_LIBADD = $(MAGICKCORE_LIBS) coders_djvu_la_SOURCES = coders/djvu.c coders_djvu_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_djvu_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) +coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # DNG coder module coders_dng_la_SOURCES = coders/dng.c @@ -3507,7 +3517,7 @@ coders_ept_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) coders_exr_la_SOURCES = coders/exr.c coders_exr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(OPENEXR_CFLAGS) coders_exr_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_exr_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(OPENEXR_LIBS) +coders_exr_la_LIBADD = $(MAGICKCORE_LIBS) $(OPENEXR_LIBS) $(MATH_LIBS) # FAX coder module coders_fax_la_SOURCES = coders/fax.c @@ -3555,7 +3565,7 @@ coders_gradient_la_LIBADD = $(MAGICKCORE_LIBS) coders_histogram_la_SOURCES = coders/histogram.c coders_histogram_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_histogram_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_histogram_la_LIBADD = $(MAGICKCORE_LIBS) +coders_histogram_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # HALD coder module coders_hald_la_SOURCES = coders/hald.c @@ -3567,7 +3577,7 @@ coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) coders_hdr_la_SOURCES = coders/hdr.c coders_hdr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_hdr_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) +coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS) # HRZ coder module coders_hrz_la_SOURCES = coders/hrz.c @@ -3621,7 +3631,7 @@ coders_jbig_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) coders_jpeg_la_SOURCES = coders/jpeg.c coders_jpeg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_jpeg_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_jpeg_la_LIBADD = $(MAGICKCORE_LIBS) $(JPEG_LIBS) +coders_jpeg_la_LIBADD = $(MAGICKCORE_LIBS) $(JPEG_LIBS) $(MATH_LIBS) # JPEG 2000 coder module coders_jp2_la_SOURCES = coders/jp2.c @@ -3632,8 +3642,8 @@ coders_jp2_la_LIBADD = $(MAGICKCORE_LIBS) $(JP2_LIBS) $(JPEG_LIBS) $(MATH_LIBS) # LABEL coder module coders_label_la_SOURCES = coders/label.c coders_label_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) -coders_label_la_LDFLAGS = $(MODULECOMMONFLAGS) $(MATH_LIBS) -coders_label_la_LIBADD = $(MAGICKCORE_LIBS) +coders_label_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_label_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # MAC coder module coders_mac_la_SOURCES = coders/mac.c @@ -3717,7 +3727,7 @@ coders_mtv_la_LIBADD = $(MAGICKCORE_LIBS) coders_mvg_la_SOURCES = coders/mvg.c coders_mvg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_mvg_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_mvg_la_LIBADD = $(MAGICKCORE_LIBS) +coders_mvg_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # NULL coder module coders_null_la_SOURCES = coders/null.c @@ -3759,7 +3769,7 @@ coders_pcd_la_LIBADD = $(MAGICKCORE_LIBS) coders_pcl_la_SOURCES = coders/pcl.c coders_pcl_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_pcl_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_pcl_la_LIBADD = $(MAGICKCORE_LIBS) +coders_pcl_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # PCX coder module coders_pcx_la_SOURCES = coders/pcx.c @@ -3933,7 +3943,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS) coders_tiff_la_SOURCES = coders/tiff.c coders_tiff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) +coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # TILE coder module coders_tile_la_SOURCES = coders/tile.c @@ -4053,7 +4063,7 @@ coders_xpm_la_LIBADD = $(MAGICKCORE_LIBS) coders_xps_la_SOURCES = coders/xps.c coders_xps_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) +coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) # XWD coder module coders_xwd_la_SOURCES = coders/xwd.c @@ -4095,10 +4105,10 @@ MAGICKCORE_LIBS = MagickCore/libMagickCore.la @WITH_MODULES_TRUE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL) MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS) MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \ - $(OSX_GCOV_LDFLAG) -version-info \ + $(OSX_GCOV_LDFLAG) $(MAGICK_LT_RELEASE_OPTS) -version-info \ $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) -MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICKCORE_LTDLDEPS) +MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICK_LTDLDEPS) # Library base sources MAGICKCORE_BASE_SRCS = \ @@ -4626,41 +4636,20 @@ MAGICKWAND_LIBS = MagickWand/libMagickWand.la MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES) MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS) MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \ - -version-info \ + $(MAGICK_LT_RELEASE_OPTS) -version-info \ $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS) MAGICKWAND_EXTRA_DIST = \ MagickWand/ChangeLog \ - MagickWand/input_256c.miff \ - MagickWand/input_bilevel.miff \ - MagickWand/input_gray.miff \ - MagickWand/input_truecolor.miff \ MagickWand/MagickWand-config.1 \ - MagickWand/MagickWand.pc.in \ - MagickWand/sequence.miff \ - MagickWand/common.sh \ - $(MAGICKWAND_TESTS) - -MagickWand_drawtest_SOURCES = MagickWand/drawtest.c -MagickWand_drawtest_LDFLAGS = $(LDFLAGS) -MagickWand_drawtest_LDADD = $(MAGICKWAND_LIBS) -MagickWand_wandtest_SOURCES = MagickWand/wandtest.c -MagickWand_wandtest_LDFLAGS = $(LDFLAGS) -MagickWand_wandtest_LDADD = $(MAGICKWAND_LIBS) -MAGICKWAND_CHECK_PGRMS = \ - MagickWand/drawtest \ - MagickWand/wandtest - -MAGICKWAND_TESTS = \ - MagickWand/drawtest.sh \ - MagickWand/wandtest.sh - -MAGICKWAND_CLEANFILES = \ - MagickWand/*_out.* + MagickWand/MagickWand.pc.in +MAGICKWAND_CLEANFILES = @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++.la +@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LDADD = +@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore.la @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_CHECK_PGRMS = @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT) @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_MANS = @@ -4686,42 +4675,8 @@ MAGICKPP_PKGCONFIG_OPT = \ Magick++/lib/ImageMagick++.pc MAGICKPP_TEST_SCRIPTS_OPT = \ - Magick++/tests/exceptions.sh \ - Magick++/tests/appendImages.sh \ - Magick++/tests/attributes.sh \ - Magick++/tests/averageImages.sh \ - Magick++/tests/coalesceImages.sh \ - Magick++/tests/coderInfo.sh \ - Magick++/tests/colorHistogram.sh \ - Magick++/tests/color.sh \ - Magick++/tests/montageImages.sh \ - Magick++/tests/morphImages.sh \ - Magick++/tests/readWriteBlob.sh \ - Magick++/tests/readWriteImages.sh \ - Magick++/demo/analyze.sh \ - Magick++/demo/button.sh \ - Magick++/demo/demo.sh \ - Magick++/demo/flip.sh \ - Magick++/demo/gravity.sh \ - Magick++/demo/piddle.sh \ - Magick++/demo/shapes.sh \ - Magick++/demo/zoom_bessel.sh \ - Magick++/demo/zoom_blackman.sh \ - Magick++/demo/zoom_box.sh \ - Magick++/demo/zoom_catrom.sh \ - Magick++/demo/zoom_cubic.sh \ - Magick++/demo/zoom_gaussian.sh \ - Magick++/demo/zoom_hamming.sh \ - Magick++/demo/zoom_hanning.sh \ - Magick++/demo/zoom_hermite.sh \ - Magick++/demo/zoom_lanczos.sh \ - Magick++/demo/zoom_mitchell.sh \ - Magick++/demo/zoom_point.sh \ - Magick++/demo/zoom_quadratic.sh \ - Magick++/demo/zoom_sample.sh \ - Magick++/demo/zoom_scale.sh \ - Magick++/demo/zoom_sinc.sh \ - Magick++/demo/zoom_triangle.sh + Magick++/tests/tests.tap \ + Magick++/demo/demos.tap MAGICKPP_EXTRA_DIST = \ Magick++/AUTHORS \ @@ -4806,7 +4761,7 @@ MAGICKPP_INCHEADERS_OPT = \ Magick++/lib/Magick++/STL.h \ Magick++/lib/Magick++/TypeMetric.h -Magick___lib_libMagick___la_LDFLAGS = -no-undefined \ +Magick___lib_libMagick___la_LDFLAGS = -no-undefined $(MAGICK_LT_RELEASE_OPTS) \ -version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE) Magick___lib_libMagick___la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) @@ -4834,47 +4789,47 @@ MAGICKPP_CHECK_PGRMS_OPT = \ Magick++/tests/readWriteImages Magick___demo_analyze_SOURCES = Magick++/demo/analyze.cpp -Magick___demo_analyze_LDADD = $(MAGICKPP_LIBS) +Magick___demo_analyze_LDADD = $(MAGICKPP_LDADD) Magick___demo_button_SOURCES = Magick++/demo/button.cpp -Magick___demo_button_LDADD = $(MAGICKPP_LIBS) +Magick___demo_button_LDADD = $(MAGICKPP_LDADD) Magick___demo_demo_SOURCES = Magick++/demo/demo.cpp -Magick___demo_demo_LDADD = $(MAGICKPP_LIBS) +Magick___demo_demo_LDADD = $(MAGICKPP_LDADD) Magick___demo_detrans_SOURCES = Magick++/demo/detrans.cpp -Magick___demo_detrans_LDADD = $(MAGICKPP_LIBS) +Magick___demo_detrans_LDADD = $(MAGICKPP_LDADD) Magick___demo_flip_SOURCES = Magick++/demo/flip.cpp -Magick___demo_flip_LDADD = $(MAGICKPP_LIBS) +Magick___demo_flip_LDADD = $(MAGICKPP_LDADD) Magick___demo_gravity_SOURCES = Magick++/demo/gravity.cpp -Magick___demo_gravity_LDADD = $(MAGICKPP_LIBS) +Magick___demo_gravity_LDADD = $(MAGICKPP_LDADD) Magick___demo_piddle_SOURCES = Magick++/demo/piddle.cpp -Magick___demo_piddle_LDADD = $(MAGICKPP_LIBS) +Magick___demo_piddle_LDADD = $(MAGICKPP_LDADD) Magick___demo_shapes_SOURCES = Magick++/demo/shapes.cpp -Magick___demo_shapes_LDADD = $(MAGICKPP_LIBS) +Magick___demo_shapes_LDADD = $(MAGICKPP_LDADD) Magick___demo_zoom_SOURCES = Magick++/demo/zoom.cpp -Magick___demo_zoom_LDADD = $(MAGICKPP_LIBS) +Magick___demo_zoom_LDADD = $(MAGICKPP_LDADD) Magick___tests_appendImages_SOURCES = Magick++/tests/appendImages.cpp -Magick___tests_appendImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_appendImages_LDADD = $(MAGICKPP_LDADD) Magick___tests_attributes_SOURCES = Magick++/tests/attributes.cpp -Magick___tests_attributes_LDADD = $(MAGICKPP_LIBS) +Magick___tests_attributes_LDADD = $(MAGICKPP_LDADD) Magick___tests_averageImages_SOURCES = Magick++/tests/averageImages.cpp -Magick___tests_averageImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_averageImages_LDADD = $(MAGICKPP_LDADD) Magick___tests_coalesceImages_SOURCES = Magick++/tests/coalesceImages.cpp -Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LDADD) Magick___tests_coderInfo_SOURCES = Magick++/tests/coderInfo.cpp -Magick___tests_coderInfo_LDADD = $(MAGICKPP_LIBS) +Magick___tests_coderInfo_LDADD = $(MAGICKPP_LDADD) Magick___tests_color_SOURCES = Magick++/tests/color.cpp -Magick___tests_color_LDADD = $(MAGICKPP_LIBS) +Magick___tests_color_LDADD = $(MAGICKPP_LDADD) Magick___tests_colorHistogram_SOURCES = Magick++/tests/colorHistogram.cpp -Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LIBS) +Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LDADD) Magick___tests_exceptions_SOURCES = Magick++/tests/exceptions.cpp -Magick___tests_exceptions_LDADD = $(MAGICKPP_LIBS) +Magick___tests_exceptions_LDADD = $(MAGICKPP_LDADD) Magick___tests_montageImages_SOURCES = Magick++/tests/montageImages.cpp -Magick___tests_montageImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_montageImages_LDADD = $(MAGICKPP_LDADD) Magick___tests_morphImages_SOURCES = Magick++/tests/morphImages.cpp -Magick___tests_morphImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_morphImages_LDADD = $(MAGICKPP_LDADD) Magick___tests_readWriteBlob_SOURCES = Magick++/tests/readWriteBlob.cpp -Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LIBS) +Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LDADD) Magick___tests_readWriteImages_SOURCES = Magick++/tests/readWriteImages.cpp -Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LIBS) +Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LDADD) MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html # Where filter modules get installed @@ -4983,27 +4938,43 @@ MAGICK_UTILITIES = convert magick-script UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities TESTS_CHECK_PGRMS = \ - tests/validate + tests/validate \ + tests/drawtest \ + tests/wandtest tests_validate_SOURCES = tests/validate.c tests/validate.h tests_validate_CPPFLAGS = $(AM_CPPFLAGS) -tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MATH_LIBS) +tests_drawtest_SOURCES = tests/drawtest.c +tests_drawtest_LDFLAGS = $(LDFLAGS) +tests_drawtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +tests_wandtest_SOURCES = tests/wandtest.c +tests_wandtest_LDFLAGS = $(LDFLAGS) +tests_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) TESTS_XFAIL_TESTS = TESTS_TESTS = \ - tests/validate-compare.sh \ - tests/validate-composite.sh \ - tests/validate-convert.sh \ - tests/validate-identify.sh \ - tests/validate-import.sh \ - tests/validate-montage.sh \ - tests/validate-pipe.sh \ - tests/validate-colorspace.sh \ - tests/validate-stream.sh \ - tests/validate-formats-in-memory.sh \ - tests/validate-formats-on-disk.sh + tests/validate-compare.tap \ + tests/validate-composite.tap \ + tests/validate-convert.tap \ + tests/validate-identify.tap \ + tests/validate-import.tap \ + tests/validate-montage.tap \ + tests/validate-pipe.tap \ + tests/validate-colorspace.tap \ + tests/validate-stream.tap \ + tests/validate-formats-in-memory.tap \ + tests/validate-formats-on-disk.tap \ + tests/drawtest.tap \ + tests/wandtest.tap TESTS_EXTRA_DIST = \ - tests/common.sh \ + tests/common.shi \ + tests/rose.pnm \ + tests/input_256c.miff \ + tests/input_bilevel.miff \ + tests/input_gray.miff \ + tests/input_truecolor.miff \ + tests/sequence.miff \ $(TESTS_TESTS) TESTS_CLEANFILES = @@ -5091,7 +5062,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .trs +.SUFFIXES: .c .cpp .lo .log .o .obj .sh .sh$(EXEEXT) .tap .tap$(EXEEXT) .trs am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/m4/Makefile.am $(srcdir)/config/Makefile.am $(srcdir)/ltdl/Makefile.inc $(srcdir)/coders/Makefile.am $(srcdir)/MagickCore/Makefile.am $(srcdir)/MagickWand/Makefile.am $(srcdir)/Magick++/Makefile.am $(srcdir)/filters/Makefile.am $(srcdir)/utilities/Makefile.am $(srcdir)/tests/Makefile.am $(srcdir)/PerlMagick/Makefile.am $(am__configure_deps) @@ -5142,6 +5113,8 @@ $(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config/config.h config/stamp-h1 +common.shi: $(top_builddir)/config.status $(srcdir)/common.shi.in + cd $(top_builddir) && $(SHELL) ./config.status $@ config/configure.xml: $(top_builddir)/config.status $(top_srcdir)/config/configure.xml.in cd $(top_builddir) && $(SHELL) ./config.status $@ config/delegates.xml: $(top_builddir)/config.status $(top_srcdir)/config/delegates.xml.in @@ -5152,6 +5125,8 @@ config/MagickCore.dox: $(top_builddir)/config.status $(top_srcdir)/config/Magick cd $(top_builddir) && $(SHELL) ./config.status $@ config/MagickWand.dox: $(top_builddir)/config.status $(top_srcdir)/config/MagickWand.dox.in cd $(top_builddir) && $(SHELL) ./config.status $@ +config/Magick++.dox: $(top_builddir)/config.status $(top_srcdir)/config/Magick++.dox.in + cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-dejavu.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-dejavu.xml.in cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-ghostscript.xml: $(top_builddir)/config.status $(top_srcdir)/config/type-ghostscript.xml.in @@ -6707,27 +6682,27 @@ Magick++/tests/readWriteImages.$(OBJEXT): \ Magick++/tests/readWriteImages$(EXEEXT): $(Magick___tests_readWriteImages_OBJECTS) $(Magick___tests_readWriteImages_DEPENDENCIES) $(EXTRA_Magick___tests_readWriteImages_DEPENDENCIES) Magick++/tests/$(am__dirstamp) @rm -f Magick++/tests/readWriteImages$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(Magick___tests_readWriteImages_OBJECTS) $(Magick___tests_readWriteImages_LDADD) $(LIBS) -MagickWand/drawtest.$(OBJEXT): MagickWand/$(am__dirstamp) \ - MagickWand/$(DEPDIR)/$(am__dirstamp) -MagickWand/drawtest$(EXEEXT): $(MagickWand_drawtest_OBJECTS) $(MagickWand_drawtest_DEPENDENCIES) $(EXTRA_MagickWand_drawtest_DEPENDENCIES) MagickWand/$(am__dirstamp) - @rm -f MagickWand/drawtest$(EXEEXT) - $(AM_V_CCLD)$(MagickWand_drawtest_LINK) $(MagickWand_drawtest_OBJECTS) $(MagickWand_drawtest_LDADD) $(LIBS) -MagickWand/wandtest.$(OBJEXT): MagickWand/$(am__dirstamp) \ - MagickWand/$(DEPDIR)/$(am__dirstamp) -MagickWand/wandtest$(EXEEXT): $(MagickWand_wandtest_OBJECTS) $(MagickWand_wandtest_DEPENDENCIES) $(EXTRA_MagickWand_wandtest_DEPENDENCIES) MagickWand/$(am__dirstamp) - @rm -f MagickWand/wandtest$(EXEEXT) - $(AM_V_CCLD)$(MagickWand_wandtest_LINK) $(MagickWand_wandtest_OBJECTS) $(MagickWand_wandtest_LDADD) $(LIBS) tests/$(am__dirstamp): @$(MKDIR_P) tests @: > tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) tests/$(DEPDIR) @: > tests/$(DEPDIR)/$(am__dirstamp) +tests/drawtest.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) +tests/drawtest$(EXEEXT): $(tests_drawtest_OBJECTS) $(tests_drawtest_DEPENDENCIES) $(EXTRA_tests_drawtest_DEPENDENCIES) tests/$(am__dirstamp) + @rm -f tests/drawtest$(EXEEXT) + $(AM_V_CCLD)$(tests_drawtest_LINK) $(tests_drawtest_OBJECTS) $(tests_drawtest_LDADD) $(LIBS) tests/tests_validate-validate.$(OBJEXT): tests/$(am__dirstamp) \ tests/$(DEPDIR)/$(am__dirstamp) tests/validate$(EXEEXT): $(tests_validate_OBJECTS) $(tests_validate_DEPENDENCIES) $(EXTRA_tests_validate_DEPENDENCIES) tests/$(am__dirstamp) @rm -f tests/validate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tests_validate_OBJECTS) $(tests_validate_LDADD) $(LIBS) +tests/wandtest.$(OBJEXT): tests/$(am__dirstamp) \ + tests/$(DEPDIR)/$(am__dirstamp) +tests/wandtest$(EXEEXT): $(tests_wandtest_OBJECTS) $(tests_wandtest_DEPENDENCIES) $(EXTRA_tests_wandtest_DEPENDENCIES) tests/$(am__dirstamp) + @rm -f tests/wandtest$(EXEEXT) + $(AM_V_CCLD)$(tests_wandtest_LINK) $(tests_wandtest_OBJECTS) $(tests_wandtest_LDADD) $(LIBS) utilities/$(am__dirstamp): @$(MKDIR_P) utilities @: > utilities/$(am__dirstamp) @@ -7001,8 +6976,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wandcli.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/drawtest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/wandtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-art.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-avs.Plo@am__quote@ @@ -7263,7 +7236,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/shl_load.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/drawtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_validate-validate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/wandtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/animate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/composite.Po@am__quote@ @@ -10446,6 +10421,20 @@ recheck: all $(check_PROGRAMS) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_SH_LOG_DRIVER_FLAGS) $(SH_LOG_DRIVER_FLAGS) -- $(SH_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +.tap.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TAP_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS) $(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.tap$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TAP_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS) $(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ @@ -10834,6 +10823,7 @@ MagickCore-install-data-local: $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h MagickCore-uninstall-local: rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h + $(MAGICKWAND_TESTS) install-exec-local-utilities: $(mkdir_p) $(DESTDIR)$(bindir) cd $(DESTDIR)$(bindir) ; \ @@ -10851,6 +10841,7 @@ uninstall-local-utilities: target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ rm -f $$target ; \ done + tests/*_out.* # If source files missing, see if they can be obtained via VPATH perl-sources: