diff --git a/MagickCore/version.h b/MagickCore/version.h
index c7d0ce3..4f4963f 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision "11606:11635"
+#define MagickSVNRevision "11786:11789M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 1
#define MagickLibMinInterface 1
-#define MagickReleaseDate "2013-04-04"
+#define MagickReleaseDate "2013-04-10"
#define MagickChangeDate "20121005"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "DPC HDRI OpenMP"
diff --git a/Makefile.am b/Makefile.am
index bababed..8b48720 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,8 +40,10 @@
$(UTILITIES_CLEANFILES) \
$(TESTS_CLEANFILES)
-bin_PROGRAMS = \
+utilities_bin_PROGRAMS = \
$(UTILITIES_PGMS)
+utilities_bindir = $(LIB_BIN_DIR_PATH)
+
# Binary scripts
bin_SCRIPTS = \
@@ -192,17 +194,58 @@
$(UTILITIES_UNINSTALL_LOCAL_TARGETS)
install-exec-hook:
- $(install_sh) -d $(DESTDIR)/$(LIB_BIN_DIR_PATH)
- cd $(DESTDIR)/$(bindir) && \
- for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
- mv -f ./$$CURR_PROG$(EXEEXT) $(DESTDIR)/$(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) && \
- $(LN_S) $(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) ./$$CURR_PROG$(EXEEXT); \
- done;
-
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/^utilities\///g' | sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo "$(LN_S) $(DESTDIR)$(utilities_bindir)/$$dir ./$$dir"; \
+ (cd $(DESTDIR)/$(bindir) && \
+ $(LN_S) $(DESTDIR)/$(utilities_bindir)/$$dir ./$$dir) || exit $$?; \
+ } \
+ ; done;
+
uninstall-hook:
- for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
- rm -f $(DESTDIR)/$(LIB_DIR_PATH)/$$CURR_PROG$(EXEEXT); \
- done;
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/^utilities\///g' | sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " link program $$files to '$(DESTDIR)$(bindir)$$dir'"; \
+ for file in $$files ; do \
+ (cd $(DESTDIR)/$(bindir) && \
+ rm -f ./$$dir) || exit $$?; \
+ done; \
+ } \
+ ; done;
rm -r -f $(LIB_BIN_DIR_PATH)
clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
diff --git a/Makefile.in b/Makefile.in
index 15538a8..89b223e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -228,10 +228,10 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = $(am__EXEEXT_1)
+utilities_bin_PROGRAMS = $(am__EXEEXT_4)
TESTS = $(TESTS_TESTS) $(am__EXEEXT_5)
XFAIL_TESTS = $(am__EXEEXT_6) $(am__EXEEXT_6)
-check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4)
+check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3)
DIST_COMMON = $(srcdir)/m4/Makefile.am $(srcdir)/config/Makefile.am \
$(srcdir)/coders/Makefile.am $(srcdir)/MagickCore/Makefile.am \
$(srcdir)/MagickWand/Makefile.am \
@@ -372,7 +372,7 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" \
- "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(utilities_bindir)" \
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" \
"$(DESTDIR)$(configsharearchdir)" "$(DESTDIR)$(docdir)" \
@@ -1766,15 +1766,9 @@
$(AM_CFLAGS) $(CFLAGS) $(filters_analyze_la_LDFLAGS) \
$(LDFLAGS) -o $@
@WITH_MODULES_TRUE@am_filters_analyze_la_rpath = -rpath $(filtersdir)
-am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
- utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
- utilities/display$(EXEEXT) utilities/identify$(EXEEXT) \
- utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \
- utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \
- utilities/stream$(EXEEXT)
-am__EXEEXT_2 = tests/validate$(EXEEXT) tests/drawtest$(EXEEXT) \
+am__EXEEXT_1 = tests/validate$(EXEEXT) tests/drawtest$(EXEEXT) \
tests/wandtest$(EXEEXT)
-am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \
+am__EXEEXT_2 = Magick++/demo/analyze$(EXEEXT) \
Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \
Magick++/demo/detrans$(EXEEXT) Magick++/demo/flip$(EXEEXT) \
Magick++/demo/gravity$(EXEEXT) Magick++/demo/piddle$(EXEEXT) \
@@ -1791,8 +1785,14 @@
Magick++/tests/morphImages$(EXEEXT) \
Magick++/tests/readWriteBlob$(EXEEXT) \
Magick++/tests/readWriteImages$(EXEEXT)
-@WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
-PROGRAMS = $(bin_PROGRAMS)
+@WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2)
+am__EXEEXT_4 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
+ utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
+ utilities/display$(EXEEXT) utilities/identify$(EXEEXT) \
+ utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \
+ utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \
+ utilities/stream$(EXEEXT)
+PROGRAMS = $(utilities_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_2 = Magick++/lib/libMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la
@@ -2887,6 +2887,7 @@
$(UTILITIES_CLEANFILES) \
$(TESTS_CLEANFILES)
+utilities_bindir = $(LIB_BIN_DIR_PATH)
# Binary scripts
bin_SCRIPTS = \
@@ -6440,12 +6441,21 @@
filters/$(DEPDIR)/$(am__dirstamp)
filters/analyze.la: $(filters_analyze_la_OBJECTS) $(filters_analyze_la_DEPENDENCIES) $(EXTRA_filters_analyze_la_DEPENDENCIES) filters/$(am__dirstamp)
$(AM_V_CCLD)$(filters_analyze_la_LINK) $(am_filters_analyze_la_rpath) $(filters_analyze_la_OBJECTS) $(filters_analyze_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
+
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+install-utilities_binPROGRAMS: $(utilities_bin_PROGRAMS)
@$(NORMAL_INSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(utilities_bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(utilities_bindir)" || exit 1; \
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
@@ -6465,33 +6475,24 @@
while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(utilities_bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(utilities_bindir)$$dir" || exit $$?; \
} \
; done
-uninstall-binPROGRAMS:
+uninstall-utilities_binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-e 's/$$/$(EXEEXT)/' \
`; \
test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(utilities_bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(utilities_bindir)" && rm -f $$files
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-
-clean-checkPROGRAMS:
- @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-utilities_binPROGRAMS:
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
@@ -10509,11 +10510,9 @@
$(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
$(HEADERS) all-local
-install-binPROGRAMS: install-libLTLIBRARIES
-
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(configsharearchdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" "$(DESTDIR)$(MagickCoreincarchdir)" "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)"; do \
+ for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(utilities_bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(configsharearchdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" "$(DESTDIR)$(MagickCoreincarchdir)" "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -10574,10 +10573,10 @@
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
-clean-am: clean-binPROGRAMS clean-checkPROGRAMS \
- clean-codersLTLIBRARIES clean-filtersLTLIBRARIES clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-local \
- clean-noinstLTLIBRARIES mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-codersLTLIBRARIES \
+ clean-filtersLTLIBRARIES clean-generic clean-libLTLIBRARIES \
+ clean-libtool clean-local clean-noinstLTLIBRARIES \
+ clean-utilities_binPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -10603,14 +10602,14 @@
install-data-local install-docDATA install-filtersLTLIBRARIES \
install-includeHEADERS install-magickppincHEADERS \
install-magickpptopincHEADERS install-man \
- install-pkgconfigDATA
+ install-pkgconfigDATA install-utilities_binPROGRAMS
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
- install-exec-local install-libLTLIBRARIES
+install-exec-am: install-binSCRIPTS install-exec-local \
+ install-libLTLIBRARIES
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
@@ -10656,14 +10655,14 @@
uninstall-am: uninstall-MagickCoreincHEADERS \
uninstall-MagickCoreincarchHEADERS \
- uninstall-MagickWandincHEADERS uninstall-binPROGRAMS \
- uninstall-binSCRIPTS uninstall-codersLTLIBRARIES \
- uninstall-configlibDATA uninstall-configshareDATA \
- uninstall-configsharearchDATA uninstall-docDATA \
- uninstall-filtersLTLIBRARIES uninstall-includeHEADERS \
- uninstall-libLTLIBRARIES uninstall-local \
- uninstall-magickppincHEADERS uninstall-magickpptopincHEADERS \
- uninstall-man uninstall-pkgconfigDATA
+ uninstall-MagickWandincHEADERS uninstall-binSCRIPTS \
+ uninstall-codersLTLIBRARIES uninstall-configlibDATA \
+ uninstall-configshareDATA uninstall-configsharearchDATA \
+ uninstall-docDATA uninstall-filtersLTLIBRARIES \
+ uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+ uninstall-local uninstall-magickppincHEADERS \
+ uninstall-magickpptopincHEADERS uninstall-man \
+ uninstall-pkgconfigDATA uninstall-utilities_binPROGRAMS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1
@@ -10673,29 +10672,29 @@
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
am--refresh check check-TESTS check-am check-local clean \
- clean-binPROGRAMS clean-checkPROGRAMS clean-codersLTLIBRARIES \
- clean-cscope clean-filtersLTLIBRARIES clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-local \
- clean-noinstLTLIBRARIES cscope cscopelist-am ctags ctags-am \
- dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ clean-checkPROGRAMS clean-codersLTLIBRARIES clean-cscope \
+ clean-filtersLTLIBRARIES clean-generic clean-libLTLIBRARIES \
+ clean-libtool clean-local clean-noinstLTLIBRARIES \
+ clean-utilities_binPROGRAMS cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-local distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-MagickCoreincHEADERS \
install-MagickCoreincarchHEADERS install-MagickWandincHEADERS \
- install-am install-binPROGRAMS install-binSCRIPTS \
- install-codersLTLIBRARIES install-configlibDATA \
- install-configshareDATA install-configsharearchDATA \
- install-data install-data-am install-data-local \
- install-docDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-hook install-exec-local \
- install-filtersLTLIBRARIES install-html install-html-am \
- install-includeHEADERS install-info install-info-am \
- install-libLTLIBRARIES install-magickppincHEADERS \
- install-magickpptopincHEADERS install-man install-man1 \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
+ install-am install-binSCRIPTS install-codersLTLIBRARIES \
+ install-configlibDATA install-configshareDATA \
+ install-configsharearchDATA install-data install-data-am \
+ install-data-local install-docDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-exec-hook \
+ install-exec-local install-filtersLTLIBRARIES install-html \
+ install-html-am install-includeHEADERS install-info \
+ install-info-am install-libLTLIBRARIES \
+ install-magickppincHEADERS install-magickpptopincHEADERS \
+ install-man install-man1 install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ install-utilities_binPROGRAMS installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
@@ -10703,14 +10702,14 @@
uninstall-MagickCoreincHEADERS \
uninstall-MagickCoreincarchHEADERS \
uninstall-MagickWandincHEADERS uninstall-am \
- uninstall-binPROGRAMS uninstall-binSCRIPTS \
- uninstall-codersLTLIBRARIES uninstall-configlibDATA \
- uninstall-configshareDATA uninstall-configsharearchDATA \
- uninstall-docDATA uninstall-filtersLTLIBRARIES uninstall-hook \
+ uninstall-binSCRIPTS uninstall-codersLTLIBRARIES \
+ uninstall-configlibDATA uninstall-configshareDATA \
+ uninstall-configsharearchDATA uninstall-docDATA \
+ uninstall-filtersLTLIBRARIES uninstall-hook \
uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-local uninstall-magickppincHEADERS \
uninstall-magickpptopincHEADERS uninstall-man uninstall-man1 \
- uninstall-pkgconfigDATA
+ uninstall-pkgconfigDATA uninstall-utilities_binPROGRAMS
MagickCore-install-data-local:
$(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
@@ -10738,10 +10737,10 @@
# If source files missing, see if they can be obtained via VPATH
#
$(PERLMAGICK)/quantum/@MAGICK_ABI_SUFFIX@.xs: $(PERLMAGICK)/quantum/quantum.xs
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
+ $(AM_V_GEN) $(LN_S) quantum.xs $@
$(PERLMAGICK)/quantum/@MAGICK_ABI_SUFFIX@.pm: $(PERLMAGICK)/quantum/quantum.pm
- $(AM_V_GEN) $(LN_S) $(notdir $^) $@
+ $(AM_V_GEN) $(LN_S) quantum.pm $@
perl-quantum-sources: $(PERLMAGICK)/quantum/@MAGICK_ABI_SUFFIX@.xs $(PERLMAGICK)/quantum/@MAGICK_ABI_SUFFIX@.pm
@@ -10843,17 +10842,58 @@
$(UTILITIES_UNINSTALL_LOCAL_TARGETS)
install-exec-hook:
- $(install_sh) -d $(DESTDIR)/$(LIB_BIN_DIR_PATH)
- cd $(DESTDIR)/$(bindir) && \
- for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
- mv -f ./$$CURR_PROG$(EXEEXT) $(DESTDIR)/$(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) && \
- $(LN_S) $(LIB_BIN_DIR_PATH)/$$CURR_PROG$(EXEEXT) ./$$CURR_PROG$(EXEEXT); \
- done;
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/^utilities\///g' | sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo "$(LN_S) $(DESTDIR)$(utilities_bindir)/$$dir ./$$dir"; \
+ (cd $(DESTDIR)/$(bindir) && \
+ $(LN_S) $(DESTDIR)/$(utilities_bindir)/$$dir ./$$dir) || exit $$?; \
+ } \
+ ; done;
uninstall-hook:
- for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
- rm -f $(DESTDIR)/$(LIB_DIR_PATH)/$$CURR_PROG$(EXEEXT); \
- done;
+ @list='$(utilities_bin_PROGRAMS)'; test -n "$(utilities_bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/^utilities\///g' | sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p || test -f $$p1; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " link program $$files to '$(DESTDIR)$(bindir)$$dir'"; \
+ for file in $$files ; do \
+ (cd $(DESTDIR)/$(bindir) && \
+ rm -f ./$$dir) || exit $$?; \
+ done; \
+ } \
+ ; done;
rm -r -f $(LIB_BIN_DIR_PATH)
clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 5f8b46f..0e3cfc2 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -163,7 +163,7 @@
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
+my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -O3 -g -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} ";
my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} ";
diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL
index f783788..068fdb8 100644
--- a/PerlMagick/quantum/Makefile.PL
+++ b/PerlMagick/quantum/Makefile.PL
@@ -163,7 +163,7 @@
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
my $INC_magick = '-I../ -I../.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
my $LIBS_magick = '-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -g -O2 -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
+my $CCFLAGS_magick = "$Config{'ccflags'} -I/usr/include/freetype2 -fopenmp -O3 -g -Wall -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16";
my $LDFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'ldflags'} ";
my $LDDLFLAGS_magick = "-L../../MagickCore/.libs -lMagickCore-7.Q16HDRI $Config{'lddlflags'} ";
diff --git a/configure b/configure
index 597f434..26b8210 100755
--- a/configure
+++ b/configure
@@ -3675,7 +3675,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=11606:11635
+MAGICK_SVN_REVISION=11786:11789M
# Substitute library versioning