]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Sat, 6 Oct 2018 00:09:06 +0000 (20:09 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 6 Oct 2018 00:09:06 +0000 (20:09 -0400)
Makefile.am
Makefile.in
coders/Makefile.am
configure
utilities/Makefile.am

index 75236833e288e12aceabc332c69d20739a7af35f..1e16ddc184df89452eb08ac78e1c9e586c3e3a62 100644 (file)
@@ -54,7 +54,9 @@ include_HEADERS =
 
 # Headers which are not installed but which are distributed
 noinst_HEADERS = \
-       $(MAGICKCORE_NOINST_HDRS)
+       $(MAGICKCORE_NOINST_HDRS) \
+       $(MAGICKWAND_NOINST_HDRS) \
+       $(CODERS_NOINST_HDRS)
 
 if WIN32_NATIVE_BUILD
 SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
index 33c1ca4419a35b08230e29ce0c290982839c066e..8e8f3f2441e4eabc0fd8f01e0656648bd849f32f 100644 (file)
@@ -2938,7 +2938,9 @@ include_HEADERS =
 
 # Headers which are not installed but which are distributed
 noinst_HEADERS = \
-       $(MAGICKCORE_NOINST_HDRS)
+       $(MAGICKCORE_NOINST_HDRS) \
+       $(MAGICKWAND_NOINST_HDRS) \
+       $(CODERS_NOINST_HDRS)
 
 @WIN32_NATIVE_BUILD_FALSE@SRCDIR = "$(srcdir)/"
 @WIN32_NATIVE_BUILD_TRUE@SRCDIR = '$(shell @WinPathScript@ $(srcdir)/)'
@@ -3248,6 +3250,140 @@ MAGICKCORE_CODER_SRCS = \
        $(MAGICKCORE_WMF_SRCS) \
        $(MAGICKCORE_X11_SRCS)
 
+CODERS_NOINST_HDRS = \
+       coders/aai.h \
+       coders/art.h \
+       coders/avs.h \
+       coders/bgr.h \
+       coders/bmp.h \
+       coders/braille.h \
+       coders/cals.h \
+       coders/caption.h \
+       coders/cin.h \
+       coders/cip.h \
+       coders/clipboard.h \
+       coders/clip.h \
+       coders/cmyk.h \
+       coders/coders.h \
+       coders/coders-list.h \
+       coders/coders-private.h \
+       coders/cut.h \
+       coders/dcm.h \
+       coders/dds.h \
+       coders/debug.h \
+       coders/dib.h \
+       coders/djvu.h \
+       coders/dng.h \
+       coders/dot.h \
+       coders/dps.h \
+       coders/dpx.h \
+       coders/emf.h \
+       coders/ept.h \
+       coders/exr.h \
+       coders/fax.h \
+       coders/fits.h \
+       coders/flif.h \
+       coders/fpx.h \
+       coders/gif.h \
+       coders/gradient.h \
+       coders/gray.h \
+       coders/hald.h \
+       coders/hdr.h \
+       coders/heic.h \
+       coders/histogram.h \
+       coders/hrz.h \
+       coders/html.h \
+       coders/icon.h \
+       coders/info.h \
+       coders/inline.h \
+       coders/ipl.h \
+       coders/jbig.h \
+       coders/jnx.h \
+       coders/jp2.h \
+       coders/jpeg.h \
+       coders/json.h \
+       coders/label.h \
+       coders/mac.h \
+       coders/magick.h \
+       coders/map.h \
+       coders/mask.h \
+       coders/mat.h \
+       coders/matte.h \
+       coders/meta.h \
+       coders/miff.h \
+       coders/mono.h \
+       coders/mpc.h \
+       coders/mpeg.h \
+       coders/mpr.h \
+       coders/msl.h \
+       coders/mtv.h \
+       coders/mvg.h \
+       coders/null.h \
+       coders/otb.h \
+       coders/palm.h \
+       coders/pango.h \
+       coders/pattern.h \
+       coders/pcd.h \
+       coders/pcl.h \
+       coders/pcx.h \
+       coders/pdb.h \
+       coders/pdf.h \
+       coders/pes.h \
+       coders/pgx.h \
+       coders/pict.h \
+       coders/pix.h \
+       coders/plasma.h \
+       coders/png.h \
+       coders/pnm.h \
+       coders/ps2.h \
+       coders/ps3.h \
+       coders/psd.h \
+       coders/psd-private.h \
+       coders/ps.h \
+       coders/pwp.h \
+       coders/raw.h \
+       coders/rgb.h \
+       coders/rgf.h \
+       coders/rla.h \
+       coders/rle.h \
+       coders/screenshot.h \
+       coders/scr.h \
+       coders/sct.h \
+       coders/sfw.h \
+       coders/sgi.h \
+       coders/sixel.h \
+       coders/stegano.h \
+       coders/sun.h \
+       coders/svg.h \
+       coders/tga.h \
+       coders/thumbnail.h \
+       coders/tiff.h \
+       coders/tile.h \
+       coders/tim.h \
+       coders/ttf.h \
+       coders/txt.h \
+       coders/uil.h \
+       coders/url.h \
+       coders/uyvy.h \
+       coders/vicar.h \
+       coders/vid.h \
+       coders/viff.h \
+       coders/vips.h \
+       coders/wbmp.h \
+       coders/webp.h \
+       coders/wmf.h \
+       coders/wpg.h \
+       coders/xbm.h \
+       coders/xcf.h \
+       coders/xc.h \
+       coders/x.h \
+       coders/xpm.h \
+       coders/xps.h \
+       coders/xtrn.h \
+       coders/xwd.h \
+       coders/ycbcr.h \
+       coders/yuv.h 
+
 @WITH_MODULES_FALSE@coders_LTLIBRARIES = 
 @WITH_MODULES_TRUE@coders_LTLIBRARIES = \
 @WITH_MODULES_TRUE@    coders/aai.la \
index ac5956140046b97cfec132dd0032c9a9a2fe7eb4..56f0414e35d9b9accab689d243fe749e8b827c16 100644 (file)
@@ -224,6 +224,140 @@ MAGICKCORE_CODER_SRCS = \
        $(MAGICKCORE_WMF_SRCS) \
        $(MAGICKCORE_X11_SRCS)
 
+CODERS_NOINST_HDRS = \
+       coders/aai.h \
+       coders/art.h \
+       coders/avs.h \
+       coders/bgr.h \
+       coders/bmp.h \
+       coders/braille.h \
+       coders/cals.h \
+       coders/caption.h \
+       coders/cin.h \
+       coders/cip.h \
+       coders/clipboard.h \
+       coders/clip.h \
+       coders/cmyk.h \
+       coders/coders.h \
+       coders/coders-list.h \
+       coders/coders-private.h \
+       coders/cut.h \
+       coders/dcm.h \
+       coders/dds.h \
+       coders/debug.h \
+       coders/dib.h \
+       coders/djvu.h \
+       coders/dng.h \
+       coders/dot.h \
+       coders/dps.h \
+       coders/dpx.h \
+       coders/emf.h \
+       coders/ept.h \
+       coders/exr.h \
+       coders/fax.h \
+       coders/fits.h \
+       coders/flif.h \
+       coders/fpx.h \
+       coders/gif.h \
+       coders/gradient.h \
+       coders/gray.h \
+       coders/hald.h \
+       coders/hdr.h \
+       coders/heic.h \
+       coders/histogram.h \
+       coders/hrz.h \
+       coders/html.h \
+       coders/icon.h \
+       coders/info.h \
+       coders/inline.h \
+       coders/ipl.h \
+       coders/jbig.h \
+       coders/jnx.h \
+       coders/jp2.h \
+       coders/jpeg.h \
+       coders/json.h \
+       coders/label.h \
+       coders/mac.h \
+       coders/magick.h \
+       coders/map.h \
+       coders/mask.h \
+       coders/mat.h \
+       coders/matte.h \
+       coders/meta.h \
+       coders/miff.h \
+       coders/mono.h \
+       coders/mpc.h \
+       coders/mpeg.h \
+       coders/mpr.h \
+       coders/msl.h \
+       coders/mtv.h \
+       coders/mvg.h \
+       coders/null.h \
+       coders/otb.h \
+       coders/palm.h \
+       coders/pango.h \
+       coders/pattern.h \
+       coders/pcd.h \
+       coders/pcl.h \
+       coders/pcx.h \
+       coders/pdb.h \
+       coders/pdf.h \
+       coders/pes.h \
+       coders/pgx.h \
+       coders/pict.h \
+       coders/pix.h \
+       coders/plasma.h \
+       coders/png.h \
+       coders/pnm.h \
+       coders/ps2.h \
+       coders/ps3.h \
+       coders/psd.h \
+       coders/psd-private.h \
+       coders/ps.h \
+       coders/pwp.h \
+       coders/raw.h \
+       coders/rgb.h \
+       coders/rgf.h \
+       coders/rla.h \
+       coders/rle.h \
+       coders/screenshot.h \
+       coders/scr.h \
+       coders/sct.h \
+       coders/sfw.h \
+       coders/sgi.h \
+       coders/sixel.h \
+       coders/stegano.h \
+       coders/sun.h \
+       coders/svg.h \
+       coders/tga.h \
+       coders/thumbnail.h \
+       coders/tiff.h \
+       coders/tile.h \
+       coders/tim.h \
+       coders/ttf.h \
+       coders/txt.h \
+       coders/uil.h \
+       coders/url.h \
+       coders/uyvy.h \
+       coders/vicar.h \
+       coders/vid.h \
+       coders/viff.h \
+       coders/vips.h \
+       coders/wbmp.h \
+       coders/webp.h \
+       coders/wmf.h \
+       coders/wpg.h \
+       coders/xbm.h \
+       coders/xcf.h \
+       coders/xc.h \
+       coders/x.h \
+       coders/xpm.h \
+       coders/xps.h \
+       coders/xtrn.h \
+       coders/xwd.h \
+       coders/ycbcr.h \
+       coders/yuv.h 
+
 if WITH_MODULES
 coders_LTLIBRARIES = \
        coders/aai.la \
index 3080f38dd958b5d27e9d8abfcb8eac713f9c049e..082d4887de9d603a322ea5ed3c4cc5f830a830ad 100755 (executable)
--- a/configure
+++ b/configure
@@ -4555,7 +4555,7 @@ MAGICK_PATCHLEVEL_VERSION=13
 
 MAGICK_VERSION=7.0.8-13
 
-MAGICK_GIT_REVISION=14879:7ad38d1be:20181005
+MAGICK_GIT_REVISION=14885:1a22fc0c8:20181005
 
 
 # Substitute library versioning
index d48849f435126e1c8f4b48f39e3c47bcf6b2187d..437370e99fc25069b490386e09d714125f97d8a8 100644 (file)
@@ -58,7 +58,6 @@ UTILITIES_CONFIGURE = \
        utilities/montage.1.in \
        utilities/stream.1.in
 
-
 UTILITIES_EXTRA_DIST = \
        $(UTILITIES_MANS) \
        $(UTILITIES_TESTS)