]> granicus.if.org Git - imagemagick/blobdiff - Makefile.in
(no commit message)
[imagemagick] / Makefile.in
index 0573a2125f20db45e7ea236c8409dbbb3e365e15..b6482e94055bd9bad63d8fb83eef4f11a9768a72 100644 (file)
@@ -862,6 +862,13 @@ coders_pdf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_pdf_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_pdf_la_rpath = -rpath $(codersdir)
+coders_pes_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+am_coders_pes_la_OBJECTS = coders/coders_pes_la-pes.lo
+coders_pes_la_OBJECTS = $(am_coders_pes_la_OBJECTS)
+coders_pes_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(coders_pes_la_LDFLAGS) $(LDFLAGS) -o $@
+@WITH_MODULES_TRUE@am_coders_pes_la_rpath = -rpath $(codersdir)
 coders_pict_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
 am_coders_pict_la_OBJECTS = coders/coders_pict_la-pict.lo
 coders_pict_la_OBJECTS = $(am_coders_pict_la_OBJECTS)
@@ -1143,8 +1150,7 @@ coders_wbmp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $@
 @WITH_MODULES_TRUE@am_coders_wbmp_la_rpath = -rpath $(codersdir)
 coders_wmf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_coders_wmf_la_OBJECTS = coders/coders_wmf_la-wmf.lo
 coders_wmf_la_OBJECTS = $(am_coders_wmf_la_OBJECTS)
 coders_wmf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1382,21 +1388,22 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \
        coders/mpeg.c coders/mpr.c coders/msl.c coders/mtv.c \
        coders/mvg.c coders/null.c coders/otb.c coders/palm.c \
        coders/pattern.c coders/pcd.c coders/pcl.c coders/pcx.c \
-       coders/pdb.c coders/pdf.c coders/pict.c coders/pix.c \
-       coders/plasma.c coders/pnm.c coders/preview.c coders/ps.c \
-       coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \
-       coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \
-       coders/scr.c coders/sct.c coders/sfw.c coders/sgi.c \
-       coders/stegano.c coders/sun.c coders/svg.c coders/tga.c \
-       coders/thumbnail.c coders/tile.c coders/tim.c coders/ttf.c \
-       coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \
-       coders/vicar.c coders/vid.c coders/viff.c coders/wbmp.c \
-       coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
-       coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \
-       coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \
-       coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
-       coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
-       coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c
+       coders/pdb.c coders/pdf.c coders/pes.c coders/pict.c \
+       coders/pix.c coders/plasma.c coders/pnm.c coders/preview.c \
+       coders/ps.c coders/ps2.c coders/ps3.c coders/psd.c \
+       coders/pwp.c coders/raw.c coders/rgb.c coders/rla.c \
+       coders/rle.c coders/scr.c coders/sct.c coders/sfw.c \
+       coders/sgi.c coders/stegano.c coders/sun.c coders/svg.c \
+       coders/tga.c coders/thumbnail.c coders/tile.c coders/tim.c \
+       coders/ttf.c coders/txt.c coders/uil.c coders/url.c \
+       coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c \
+       coders/wbmp.c coders/wpg.c coders/xbm.c coders/xc.c \
+       coders/xcf.c coders/xpm.c coders/xps.c coders/ycbcr.c \
+       coders/yuv.c coders/dps.c coders/djvu.c coders/exr.c \
+       coders/fpx.c coders/clipboard.c coders/emf.c coders/jbig.c \
+       coders/jpeg.c coders/jp2.c coders/png.c coders/ept.c \
+       coders/tiff.c coders/wmf.c coders/x.c coders/xwd.c \
+       filters/analyze.c
 am__objects_2 = magick/magick_libMagickCore_la-accelerate.lo \
        magick/magick_libMagickCore_la-animate.lo \
        magick/magick_libMagickCore_la-annotate.lo \
@@ -1566,6 +1573,7 @@ am__objects_16 = coders/magick_libMagickCore_la-art.lo \
        coders/magick_libMagickCore_la-pcx.lo \
        coders/magick_libMagickCore_la-pdb.lo \
        coders/magick_libMagickCore_la-pdf.lo \
+       coders/magick_libMagickCore_la-pes.lo \
        coders/magick_libMagickCore_la-pict.lo \
        coders/magick_libMagickCore_la-pix.lo \
        coders/magick_libMagickCore_la-plasma.lo \
@@ -1936,35 +1944,36 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_palm_la_SOURCES) $(coders_pattern_la_SOURCES) \
        $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
        $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
-       $(coders_pdf_la_SOURCES) $(coders_pict_la_SOURCES) \
-       $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
-       $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
-       $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
-       $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
-       $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
-       $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \
-       $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
-       $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \
-       $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
-       $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
-       $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
-       $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \
-       $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
-       $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \
-       $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
-       $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
-       $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_wmf_la_SOURCES) \
-       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
-       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
-       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
-       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
-       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
-       $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
-       $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
-       $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
-       $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
-       $(ltdl_shl_load_la_SOURCES) $(magick_libMagickCore_la_SOURCES) \
+       $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \
+       $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+       $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+       $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+       $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+       $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+       $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \
+       $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
+       $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \
+       $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+       $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+       $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+       $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \
+       $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
+       $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \
+       $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \
+       $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \
+       $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \
+       $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
+       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
+       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
+       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
+       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
+       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
+       $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
+       $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
+       $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
+       $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
+       $(magick_libMagickCore_la_SOURCES) \
        $(wand_libMagickWand_la_SOURCES) \
        $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
@@ -2023,35 +2032,35 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_palm_la_SOURCES) $(coders_pattern_la_SOURCES) \
        $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
        $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
-       $(coders_pdf_la_SOURCES) $(coders_pict_la_SOURCES) \
-       $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
-       $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
-       $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
-       $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
-       $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
-       $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \
-       $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
-       $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \
-       $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
-       $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
-       $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
-       $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \
-       $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
-       $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \
-       $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
-       $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
-       $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_wmf_la_SOURCES) \
-       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
-       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
-       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
-       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
-       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
-       $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
-       $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
-       $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
-       $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
-       $(ltdl_shl_load_la_SOURCES) \
+       $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \
+       $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+       $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+       $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+       $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+       $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+       $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \
+       $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
+       $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \
+       $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+       $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+       $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+       $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \
+       $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
+       $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \
+       $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \
+       $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \
+       $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \
+       $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
+       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
+       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
+       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
+       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
+       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
+       $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
+       $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
+       $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
+       $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
        $(am__magick_libMagickCore_la_SOURCES_DIST) \
        $(wand_libMagickWand_la_SOURCES) \
        $(Magick___demo_analyze_SOURCES) \
@@ -2339,7 +2348,9 @@ MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
 MAGICK_LIBLTDL = @MAGICK_LIBLTDL@
 MAGICK_LIBRARY_AGE = @MAGICK_LIBRARY_AGE@
 MAGICK_LIBRARY_CURRENT = @MAGICK_LIBRARY_CURRENT@
+MAGICK_LIBRARY_CURRENT_MIN = @MAGICK_LIBRARY_CURRENT_MIN@
 MAGICK_LIBRARY_REVISION = @MAGICK_LIBRARY_REVISION@
+MAGICK_LIBRARY_VERSION_INFO = @MAGICK_LIBRARY_VERSION_INFO@
 MAGICK_LIBS = @MAGICK_LIBS@
 MAGICK_LIB_VERSION = @MAGICK_LIB_VERSION@
 MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@
@@ -2372,7 +2383,6 @@ P7ZIP = @P7ZIP@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_CHANGE_DATE = @PACKAGE_CHANGE_DATE@
-PACKAGE_LIB_SUBVERSION = @PACKAGE_LIB_SUBVERSION@
 PACKAGE_LIB_VERSION = @PACKAGE_LIB_VERSION@
 PACKAGE_LIB_VERSION_NUMBER = @PACKAGE_LIB_VERSION_NUMBER@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -2382,6 +2392,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_VERSION_ADDENDUM = @PACKAGE_VERSION_ADDENDUM@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCLCMYKDevice = @PCLCMYKDevice@
 PCLColorDevice = @PCLColorDevice@
@@ -2409,6 +2420,7 @@ RANLIB = @RANLIB@
 RLEEncodeDelegate = @RLEEncodeDelegate@
 RMDelegate = @RMDelegate@
 RPM = @RPM@
+RSVGDecodeDelegate = @RSVGDecodeDelegate@
 RSVG_CFLAGS = @RSVG_CFLAGS@
 RSVG_LIBS = @RSVG_LIBS@
 SBIN_DIR = @SBIN_DIR@
@@ -2436,7 +2448,6 @@ UMEM_LIBS = @UMEM_LIBS@
 VERSION = @VERSION@
 WMFDecodeDelegate = @WMFDecodeDelegate@
 WMF_LIBS = @WMF_LIBS@
-WMF_LIBS_DEPS = @WMF_LIBS_DEPS@
 WWWDecodeDelegate = @WWWDecodeDelegate@
 WinPathScript = @WinPathScript@
 X11_LIBS = @X11_LIBS@
@@ -2541,6 +2552,7 @@ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -av
 # We want to preserve user-provided option variables so the same
 # compiler, headers, and libraries are used as for a normal build.
 DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS)
+DISTCLEANFILES = _configs.sed magick/magick-config.h
 CLEANFILES = $(LTDL_CLEANFILES) $(WAND_CLEANFILES) \
        $(MAGICKPP_CLEANFILES) $(UTILITIES_CLEANFILES) \
        $(TESTS_CLEANFILES) ltdl/libltdl.la ltdl/libltdlc.la \
@@ -2569,6 +2581,7 @@ TESTS_ENVIRONMENT = \
   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" \
   MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
   VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
        LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
@@ -2822,6 +2835,7 @@ MAGICK_CODER_SRCS = \
        coders/pcx.c \
        coders/pdb.c \
        coders/pdf.c \
+       coders/pes.c \
        coders/pict.c \
        coders/pix.c \
        coders/plasma.c \
@@ -2932,6 +2946,7 @@ MAGICK_CODER_SRCS = \
 @WITH_MODULES_TRUE@    coders/pcx.la \
 @WITH_MODULES_TRUE@    coders/pdb.la \
 @WITH_MODULES_TRUE@    coders/pdf.la \
+@WITH_MODULES_TRUE@    coders/pes.la \
 @WITH_MODULES_TRUE@    coders/pict.la \
 @WITH_MODULES_TRUE@    coders/pix.la \
 @WITH_MODULES_TRUE@    coders/plasma.la \
@@ -3366,6 +3381,12 @@ coders_pdf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS)
 coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS)
 
+# PES coder module
+coders_pes_la_SOURCES = coders/pes.c
+coders_pes_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_pes_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_pes_la_LIBADD = $(MAGICKCORE_LIBS)
+
 # PICT coder module
 coders_pict_la_SOURCES = coders/pict.c
 coders_pict_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
@@ -4507,12 +4528,13 @@ TESTS_TESTS = \
        tests/validate-compare.sh \
        tests/validate-composite.sh \
        tests/validate-convert.sh \
-       tests/validate-formats-on-disk.sh \
-       tests/validate-formats-in-memory.sh \
        tests/validate-identify.sh \
        tests/validate-import.sh \
        tests/validate-montage.sh \
-       tests/validate-stream.sh
+       tests/validate-pipe.sh \
+       tests/validate-stream.sh \
+       tests/validate-formats-in-memory.sh \
+       tests/validate-formats-on-disk.sh
 
 TESTS_EXTRA_DIST = \
        tests/common.sh \
@@ -4556,7 +4578,9 @@ doc_DATA = \
        ChangeLog \
        NEWS.txt
 
-@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version
+@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \
+@MAINTAINER_MODE_TRUE@ magick-version
+
 
 # Non-Automake subdirectories to distribute
 DISTDIRS = images scenes scripts www PerlMagick
@@ -4577,23 +4601,23 @@ HTML_UNINSTALL_DATA_TARGETS = uninstall-data-html
 #
 # Build Windows source Zip and 7Zip balls
 #
-@ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.zip
+@ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.zip
 @P7ZIP_DELEGATE_FALSE@DIST_WINDOWS_SRC_7ZIP = 
-@P7ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_7ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.7z
+@P7ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_7ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.7z
 
 #
 # RPM build support
 #
-@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir)-$(PACKAGE_RELEASE).src.rpm
+@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir).src.rpm
 @RPM_DELEGATE_TRUE@RPMDIR = redhat
 @RPM_DELEGATE_TRUE@RPMARCH = i386
 @RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM = 
 @RPM_DELEGATE_TRUE@DIST_ARCHIVE_RPM = \
-@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
 
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
@@ -5127,6 +5151,10 @@ coders/coders_pdf_la-pdf.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/pdf.la: $(coders_pdf_la_OBJECTS) $(coders_pdf_la_DEPENDENCIES) coders/$(am__dirstamp)
        $(AM_V_CCLD)$(coders_pdf_la_LINK) $(am_coders_pdf_la_rpath) $(coders_pdf_la_OBJECTS) $(coders_pdf_la_LIBADD) $(LIBS)
+coders/coders_pes_la-pes.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
+coders/pes.la: $(coders_pes_la_OBJECTS) $(coders_pes_la_DEPENDENCIES) coders/$(am__dirstamp)
+       $(AM_V_CCLD)$(coders_pes_la_LINK) $(am_coders_pes_la_rpath) $(coders_pes_la_OBJECTS) $(coders_pes_la_LIBADD) $(LIBS)
 coders/coders_pict_la-pict.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/pict.la: $(coders_pict_la_OBJECTS) $(coders_pict_la_DEPENDENCIES) coders/$(am__dirstamp)
@@ -5680,6 +5708,8 @@ coders/magick_libMagickCore_la-pdb.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-pdf.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
+coders/magick_libMagickCore_la-pes.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-pict.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-pix.lo: coders/$(am__dirstamp) \
@@ -6319,6 +6349,8 @@ mostlyclean-compile:
        -rm -f coders/coders_pdb_la-pdb.lo
        -rm -f coders/coders_pdf_la-pdf.$(OBJEXT)
        -rm -f coders/coders_pdf_la-pdf.lo
+       -rm -f coders/coders_pes_la-pes.$(OBJEXT)
+       -rm -f coders/coders_pes_la-pes.lo
        -rm -f coders/coders_pict_la-pict.$(OBJEXT)
        -rm -f coders/coders_pict_la-pict.lo
        -rm -f coders/coders_pix_la-pix.$(OBJEXT)
@@ -6539,6 +6571,8 @@ mostlyclean-compile:
        -rm -f coders/magick_libMagickCore_la-pdb.lo
        -rm -f coders/magick_libMagickCore_la-pdf.$(OBJEXT)
        -rm -f coders/magick_libMagickCore_la-pdf.lo
+       -rm -f coders/magick_libMagickCore_la-pes.$(OBJEXT)
+       -rm -f coders/magick_libMagickCore_la-pes.lo
        -rm -f coders/magick_libMagickCore_la-pict.$(OBJEXT)
        -rm -f coders/magick_libMagickCore_la-pict.lo
        -rm -f coders/magick_libMagickCore_la-pix.$(OBJEXT)
@@ -7009,6 +7043,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pcx_la-pcx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pdb_la-pdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pdf_la-pdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pes_la-pes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pict_la-pict.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pix_la-pix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_plasma_la-plasma.Plo@am__quote@
@@ -7119,6 +7154,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Plo@am__quote@
@@ -7841,6 +7877,14 @@ coders/coders_pdf_la-pdf.lo: coders/pdf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pdf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pdf_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
 
+coders/coders_pes_la-pes.lo: coders/pes.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pes_la-pes.lo -MD -MP -MF coders/$(DEPDIR)/coders_pes_la-pes.Tpo -c -o coders/coders_pes_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pes_la-pes.Tpo coders/$(DEPDIR)/coders_pes_la-pes.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/pes.c' object='coders/coders_pes_la-pes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pes_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+
 coders/coders_pict_la-pict.lo: coders/pict.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pict_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pict_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/coders_pict_la-pict.Tpo -c -o coders/coders_pict_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pict_la-pict.Tpo coders/$(DEPDIR)/coders_pict_la-pict.Plo
@@ -9457,6 +9501,14 @@ coders/magick_libMagickCore_la-pdf.lo: coders/pdf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
 
+coders/magick_libMagickCore_la-pes.lo: coders/pes.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pes.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo -c -o coders/magick_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/pes.c' object='coders/magick_libMagickCore_la-pes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+
 coders/magick_libMagickCore_la-pict.lo: coders/pict.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo -c -o coders/magick_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo
@@ -10818,6 +10870,7 @@ distclean-generic:
        -rm -f utilities/$(am__dirstamp)
        -rm -f wand/$(DEPDIR)/$(am__dirstamp)
        -rm -f wand/$(am__dirstamp)
+       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -11121,16 +11174,17 @@ html:
        doxygen config/MagickCore.dox
        doxygen config/MagickWand.dox
 $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
-       if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; then \
-         chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
-         rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
+       if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
+         chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
+         rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
        fi
+  svn export https://subversion.imagemagick.org/subversion/ImageMagick-Windows/trunk $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 @ZIP_DELEGATE_TRUE@    rm -f $(DIST_WINDOWS_SRC_ZIP)
-@ZIP_DELEGATE_TRUE@    $(ZIP) -r -9 -q  $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+@ZIP_DELEGATE_TRUE@    $(ZIP) -r -9 -q  $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 @P7ZIP_DELEGATE_TRUE@  rm -f $(DIST_WINDOWS_SRC_7ZIP)
-@P7ZIP_DELEGATE_TRUE@  $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+@P7ZIP_DELEGATE_TRUE@  $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 @P7ZIP_DELEGATE_TRUE@  chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
-       rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+       rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 @RPM_DELEGATE_TRUE@.PHONY: srpm
 @RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
 @RPM_DELEGATE_TRUE@    rm -f $(DIST_ARCHIVE_SRPM)