]> granicus.if.org Git - imagemagick/blobdiff - Makefile.in
projects / imagemagick / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(no commit message)
[imagemagick] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index f4d375cf1db8ca967e8e199fb724f00b7951cb68..9146d00f82069c48b14a025c2a96ccfaee2a0932 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,18 +275,21 @@ DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \
 @CONVENIENCE_LTDL_TRUE@am__append_3 = ltdl/libltdlc.la
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_compile_warnings.m4 \
-       $(top_srcdir)/m4/ac_func_fseeko.m4 \
-       $(top_srcdir)/m4/ac_prog_perl_version.m4 \
-       $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/argz.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \
+       $(top_srcdir)/m4/argz.m4 \
+       $(top_srcdir)/m4/ax_c___attribute__.m4 \
+       $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
+       $(top_srcdir)/m4/ax_compare_version.m4 \
+       $(top_srcdir)/m4/ax_cxx_bool.m4 \
+       $(top_srcdir)/m4/ax_cxx_namespace_std.m4 \
+       $(top_srcdir)/m4/ax_cxx_namespaces.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/cxx_have_bool.m4 \
+       $(top_srcdir)/m4/ax_prog_perl_version.m4 \
+       $(top_srcdir)/m4/ax_pthread.m4 \
        $(top_srcdir)/m4/cxx_have_lstring.m4 \
-       $(top_srcdir)/m4/cxx_have_namespaces.m4 \
        $(top_srcdir)/m4/cxx_have_std_libs.m4 \
-       $(top_srcdir)/m4/cxx_have_std_namespace.m4 \
        $(top_srcdir)/m4/framework.m4 $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
        $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@@ -1150,8 +1153,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) \
@@ -1361,27 +1363,27 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \
        magick/resize.c magick/resize.h magick/resize-private.h \
        magick/resource.c magick/resource_.h magick/segment.c \
        magick/segment.h magick/semaphore.c magick/semaphore.h \
-       magick/shear.c magick/shear.h magick/signature.c \
-       magick/signature.h magick/signature-private.h \
-       magick/splay-tree.c magick/splay-tree.h magick/static.c \
-       magick/static.h magick/statistic.c magick/statistic.h \
-       magick/stream.c magick/stream.h magick/stream-private.h \
-       magick/string.c magick/string_.h magick/string-private.h \
-       magick/studio.h magick/thread.c magick/thread_.h \
-       magick/thread-private.h magick/timer.c magick/timer.h \
-       magick/token.c magick/token.h magick/token-private.h \
-       magick/transform.c magick/transform.h magick/threshold.c \
-       magick/threshold.h magick/type.c magick/type.h \
-       magick/utility.c magick/utility.h magick/version.c \
-       magick/version.h magick/vms.h magick/widget.c magick/widget.h \
-       magick/xml-tree.c magick/xml-tree.h magick/xwindow.c \
-       magick/xwindow.h magick/nt-feature.c magick/nt-base.c \
-       coders/art.c coders/avs.c coders/bmp.c coders/braille.c \
-       coders/cals.c coders/caption.c coders/cin.c coders/cip.c \
-       coders/clip.c coders/cmyk.c coders/cut.c coders/dcm.c \
-       coders/dds.c coders/dib.c coders/dng.c coders/dot.c \
-       coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
-       coders/gradient.c coders/gray.c coders/hald.c \
+       magick/semaphore-private.h magick/shear.c magick/shear.h \
+       magick/signature.c magick/signature.h \
+       magick/signature-private.h magick/splay-tree.c \
+       magick/splay-tree.h magick/static.c magick/static.h \
+       magick/statistic.c magick/statistic.h magick/stream.c \
+       magick/stream.h magick/stream-private.h magick/string.c \
+       magick/string_.h magick/string-private.h magick/studio.h \
+       magick/thread.c magick/thread_.h magick/thread-private.h \
+       magick/timer.c magick/timer.h magick/token.c magick/token.h \
+       magick/token-private.h magick/transform.c magick/transform.h \
+       magick/threshold.c magick/threshold.h magick/type.c \
+       magick/type.h magick/utility.c magick/utility.h \
+       magick/version.c magick/version.h magick/vms.h magick/widget.c \
+       magick/widget.h magick/xml-tree.c magick/xml-tree.h \
+       magick/xwindow.c magick/xwindow.h magick/nt-feature.c \
+       magick/nt-base.c coders/art.c coders/avs.c coders/bmp.c \
+       coders/braille.c coders/cals.c coders/caption.c coders/cin.c \
+       coders/cip.c coders/clip.c coders/cmyk.c coders/cut.c \
+       coders/dcm.c coders/dds.c coders/dib.c coders/dng.c \
+       coders/dot.c coders/dpx.c coders/fax.c coders/fits.c \
+       coders/gif.c coders/gradient.c coders/gray.c coders/hald.c \
        coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
        coders/info.c coders/inline.c coders/ipl.c coders/label.c \
        coders/magick.c coders/map.c coders/mat.c coders/matte.c \
@@ -2358,6 +2360,9 @@ MAGICK_LIB_VERSION_NUMBER = @MAGICK_LIB_VERSION_NUMBER@
 MAGICK_LIB_VERSION_TEXT = @MAGICK_LIB_VERSION_TEXT@
 MAGICK_LTDLDEPS = @MAGICK_LTDLDEPS@
 MAGICK_PCFLAGS = @MAGICK_PCFLAGS@
+MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@
+MAGICK_TARGET_OS = @MAGICK_TARGET_OS@
+MAGICK_TARGET_VENDOR = @MAGICK_TARGET_VENDOR@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANDelegate = @MANDelegate@
@@ -2404,6 +2409,7 @@ PERL = @PERL@
 PERLMAINCC = @PERLMAINCC@
 PERL_MAKE_OPTIONS = @PERL_MAKE_OPTIONS@
 PERL_SUPPORTS_DESTDIR = @PERL_SUPPORTS_DESTDIR@
+PERL_VERSION = @PERL_VERSION@
 PERSISTINCLUDE_DIR = @PERSISTINCLUDE_DIR@
 PGPDecodeDelegate = @PGPDecodeDelegate@
 PKG_CONFIG = @PKG_CONFIG@
@@ -2449,7 +2455,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@
@@ -2475,12 +2480,12 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -2583,6 +2588,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}" \
@@ -2634,29 +2640,31 @@ EXTRA_LTLIBRARIES = ltdl/dlopen.la ltdl/dld_link.la ltdl/dyld.la \
 BUILT_SOURCES = ltdl/$(ARGZ_H)
 MOSTLYCLEANFILES = ltdl/argz.h ltdl/argz.h-t
 M4_EXTRA_DIST = \
-  ac_compile_warnings.m4 \
-  ac_func_fseeko.m4 \
-  ac_prog_perl_version.m4 \
-  acx_pthread.m4 \
-  argz.m4 \
-  ax_opencl.m4 \
-  ax_lang_compiler_ms.m4 \
-  ax_prefix_config_h.m4 \
-  cxx_have_bool.m4 \
-  cxx_have_lstring.m4 \
-  cxx_have_namespaces.m4 \
-  cxx_have_std_libs.m4 \
-  cxx_have_std_namespace.m4 \
-  framework.m4 \
-  libtool.m4 \
-  ltdl.m4 \
-  ltoptions.m4 \
-  ltsugar.m4 \
-  ltversion.m4 \
-  lt~obsolete.m4 \
-  magick_check_pthread_lib.m4 \
-  magick_func_mmap_fileio.m4 \
-  pkg.m4
+       ac_func_fseeko.m4  \
+       argz.m4  \
+       ax_c___attribute__.m4  \
+       ax_cflags_warn_all.m4  \
+       ax_compare_version.m4  \
+       ax_cxx_bool.m4  \
+       ax_cxx_namespaces.m4  \
+       ax_cxx_namespace_std.m4  \
+       ax_lang_compiler_ms.m4  \
+       ax_opencl.m4  \
+       ax_prefix_config_h.m4  \
+       ax_prog_perl_version.m4  \
+       ax_pthread.m4  \
+       cxx_have_lstring.m4  \
+       cxx_have_std_libs.m4  \
+       framework.m4  \
+       libtool.m4  \
+       ltdl.m4  \
+       lt~obsolete.m4  \
+       ltoptions.m4  \
+       ltsugar.m4  \
+       ltversion.m4  \
+       magick_check_pthread_lib.m4  \
+       magick_func_mmap_fileio.m4  \
+       pkg.m4  
 
 
 # Where architecture-independent configuration files get installed
@@ -3866,6 +3874,7 @@ MAGICK_BASE_SRCS = \
        magick/segment.h \
        magick/semaphore.c \
        magick/semaphore.h \
+       magick/semaphore-private.h \
        magick/shear.c \
        magick/shear.h \
        magick/signature.c \
@@ -4037,6 +4046,7 @@ MAGICK_NOINST_HDRS = \
        magick/random-private.h \
        magick/resample-private.h \
        magick/resize-private.h \
+       magick/semaphore-private.h \
        magick/signature-private.h \
        magick/static.h \
        magick/stream-private.h \
@@ -4529,12 +4539,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 \
@@ -4578,7 +4589,11 @@ doc_DATA = \
        ChangeLog \
        NEWS.txt
 
-@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version
+@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \
+@MAINTAINER_MODE_TRUE@ magick-version \
+@MAINTAINER_MODE_TRUE@  ImageMagick.spec \
+@MAINTAINER_MODE_TRUE@  $(PERLMAGICK_MAINTAINER_TARGETS)
+
 
 # Non-Automake subdirectories to distribute
 DISTDIRS = images scenes scripts www PerlMagick
@@ -4606,9 +4621,9 @@ HTML_UNINSTALL_DATA_TARGETS = uninstall-data-html
 #
 # RPM build support
 #
-@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir).src.rpm
-@RPM_DELEGATE_TRUE@RPMDIR = redhat
-@RPM_DELEGATE_TRUE@RPMARCH = i386
+@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir)-1.src.rpm
+@RPM_DELEGATE_TRUE@RPMDIR = rpmbuild
+@RPM_DELEGATE_TRUE@RPMARCH = $(MAGICK_TARGET_CPU)
 @RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM = 
 @RPM_DELEGATE_TRUE@DIST_ARCHIVE_RPM = \
 @RPM_DELEGATE_TRUE@    $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
@@ -11032,8 +11047,7 @@ perl-sources:
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) CC='@CC@' install && \
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) clean && rm -f  Makefile.old )
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) CC='@CC@' install )
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources
 
@@ -11111,17 +11125,23 @@ maintainer-clean-local: $(PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS)
 
 check-local: $(PERLMAGICK_CHECK_LOCAL_TARGETS)
 
+# drd: valgrind's newer thread error detector
 drd:
-       $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes --quiet $(VALGRIND_EXTRA_OPTS)' check
+  $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
+    --quiet $(VALGRIND_EXTRA_OPTS)' check
 
+# helgrind: valgrind's older thread error detector
 helgrind:
-       $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
+  $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
 
+# memcheck: valgrind's memory access checker
 memcheck:
-       $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
+  $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
+    --track-origins=yes --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
 
+# ptrcheck: valgrind's experimental pointer checking tool.
 ptrcheck:
-       $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
+  $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
 dist-hook:
        ( \
          builddir=`pwd` ; \
@@ -11184,7 +11204,7 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 @P7ZIP_DELEGATE_TRUE@  chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
        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@$(DIST_ARCHIVE_SRPM) srpm: dist
 @RPM_DELEGATE_TRUE@    rm -f $(DIST_ARCHIVE_SRPM)
 @RPM_DELEGATE_TRUE@    $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
@@ -11192,14 +11212,12 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
 
 @RPM_DELEGATE_TRUE@.PHONY: rpm
-@RPM_DELEGATE_TRUE@rpm:
+@RPM_DELEGATE_TRUE@rpm:        dist
 @RPM_DELEGATE_TRUE@    rm -rf $(RPMDIR)
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)/BUILD
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)/RPMS
-@RPM_DELEGATE_TRUE@    $(MAKE) distcheck
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/BUILD
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/RPMS
 @RPM_DELEGATE_TRUE@    $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-@RPM_DELEGATE_TRUE@    rm -rf rpmbuild
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
 @RPM_DELEGATE_TRUE@    @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
 @RPM_DELEGATE_TRUE@    @echo ==============================================================
Unnamed repository; edit this file 'description' to name the repository.