From: Cristy Date: Fri, 1 Apr 2016 10:28:50 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.1-0~95 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39da8e746c180fff22cbffd14b97840bb67fd886;p=imagemagick ... --- diff --git a/Makefile.in b/Makefile.in index cb26f074f..1213c929f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4956,15 +4956,15 @@ UTILITIES_CONFIGURE = \ utilities/montage.1.in \ utilities/stream.1.in +MAGICK_UTILITIES = animate compare composite conjure display identify import magick-script mogrify montage stream UTILITIES_EXTRA_DIST = \ - animate compare composite conjure convert display identify import magick-script mogrify montage stream \ + $(MAGICK_UTILITIES) \ $(UTILITIES_MANS) \ $(UTILITIES_TESTS) UTILITIES_CLEANFILES = # Link these utilities to 'magick'. -MAGICK_UTILITIES = animate compare composite conjure display identify import magick-script mogrify montage stream UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities diff --git a/configure b/configure index 053b12a2b..6bb1d93e9 100755 --- a/configure +++ b/configure @@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_GIT_REVISION=17939:0559554:20160331 +MAGICK_GIT_REVISION=17940:33ce5a3:20160401 # Substitute library versioning diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 8611cdd3e..135cc0b5a 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -55,15 +55,16 @@ UTILITIES_CONFIGURE = \ utilities/montage.1.in \ utilities/stream.1.in +MAGICK_UTILITIES=animate compare composite conjure display identify import magick-script mogrify montage stream + UTILITIES_EXTRA_DIST = \ - animate compare composite conjure convert display identify import magick-script mogrify montage stream \ + $(MAGICK_UTILITIES) \ $(UTILITIES_MANS) \ $(UTILITIES_TESTS) UTILITIES_CLEANFILES = # Link these utilities to 'magick'. -MAGICK_UTILITIES=animate compare composite conjure display identify import magick-script mogrify montage stream UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities install-exec-local-utilities: $(mkdir_p) $(DESTDIR)$(bindir)