* coders/png.c: Accept exIf chunks whose data segment

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7eb3b38d45128da0351b461253e89b1223ddb9a4..ea9f22c1a572a316711d8374ac92602ead2d6681 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-#  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
 #
 #  You may not use this file except in compliance with the License.  You may
 #  obtain a copy of the License at
 #
-#    http://www.imagemagick.org/script/license.php
+#    https://www.imagemagick.org/script/license.php
 #
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,14 @@
 #  Top-Level Makefile for building ImageMagick.
 #
 
+topincludedir = @includedir@/MagickCore
+
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 ACLOCAL_AMFLAGS = -I m4
 
 MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version
-
-SUBDIRS = .
+MODULECOMMONCPPFLAGS = $(AM_CPPFLAGS)
 
 # Options to pass when running configure in the distcheck target.
 #
@@ -31,7 +32,7 @@ SUBDIRS = .
 # compiler, headers, and libraries are used as for a normal build.
 DISTCHECK_CONFIGURE_FLAGS=$(DISTCHECK_CONFIG_FLAGS)
 
-DISTCLEANFILES = _configs.sed MagickCore/magick-config.h
+DISTCLEANFILES = _configs.sed MagickCore/magick-baseconfig.h
 
 ## Make sure these will be cleaned even when they're not built by default.
 CLEANFILES = \
@@ -156,19 +157,22 @@ pkgconfig_DATA = \
 %-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc
        cp -f $^ $@
 
+# Architecture independent data files installed in the package's data directory
+docdir = $(DOCUMENTATION_PATH)
+
 # Manual pages to install
+if INSTALL_DOC#
 man_MANS = \
        $(MAGICKCORE_MANS) \
        $(MAGICKWAND_MANS) \
        $(MAGICKPP_MANS) \
        $(UTILITIES_MANS)
 
-# Architecture independent data files installed in the package's data directory
-docdir = $(DOCUMENTATION_PATH)
 doc_DATA = \
        LICENSE \
        ChangeLog \
        NEWS.txt
+endif
 
 if MAINTAINER_MODE
 MAINTAINER_TARGETS = \
@@ -182,14 +186,9 @@ all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINE
 install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
        $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
-       $(HTML_INSTALL_DATA_TARGETS)
+install-data-local: $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
 
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
-       $(HTML_UNINSTALL_DATA_TARGETS) \
-       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
+uninstall-local: $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS) $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 
@@ -227,7 +226,7 @@ dist-hook:
          cd $(srcdir) && \
          ( \
            for dir in $(DISTDIRS) ; do \
-             find $$dir -depth -print | egrep -v '(~$$)|(/.svn)|(/\.#)|(/\.deps)|(/\.svn)' \
+             find $$dir -depth -print | egrep -v '(~$$)|(/.git)|(/\.#)|(/\.deps)|(/\.git)' \
                | cpio -pdum $$builddir/$(distdir) 2> /dev/null ; \
            done \
          ) \
@@ -239,14 +238,25 @@ dist-hook:
 
 # Install HTML files
 pkgdocdir = $(DOCUMENTATION_PATH)
-DOCDIRS = images images/patterns www www/api www/source www/api/MagickCore www/api/MagickWand www/Magick++
+DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand
+DOCDIRSMANUAL = images images/patterns www www/css www/js www/api www/source www/Magick++
+DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
+
+if INSTALL_DOC
 HTML_INSTALL_DATA_TARGETS = install-data-html
+endif
+
 install-data-html:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
        $(INSTALL_DATA) $(srcdir)/index.html $(DESTDIR)$(pkgdocdir)
        @for dir in $(DOCDIRS) ; do \
          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
-         for file in $(srcdir)/$$dir/*.* ; do \
+         if test -d $(builddir)/$$dir ; then \
+               docsrcdir=$(builddir)/$$dir; \
+         else \
+               docsrcdir=$(srcdir)/$$dir; \
+         fi; \
+         for file in $$docsrcdir/*.* ; do \
            echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$$dir" ; \
            $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$$dir ; \
          done ; \
@@ -282,10 +292,25 @@ libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
 # Format C API documentation
-html:
-       doxygen config/MagickCore.dox
-       doxygen config/MagickWand.dox
-       doxygen config/Magick++.dox
+html-local:
+# copy static file
+       for dir in $(DOCDIRSMANUAL) ; do \
+               $(MKDIR_P) $(top_builddir)/$$dir ;\
+               for file in $$dir/*.* ; do \
+                       if ! test -f $(top_builddir)/$$file; then \
+                               cp -p -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+                       fi; \
+               done ; \
+       done;
+# remove old doxygen files
+       for dir in $(DOCDIRDOXYGEN) ; do \
+           rm -rf $$dir || true; \
+       done;
+# make doxygen doc
+       $(MKDIR_P) $(top_builddir)/www/api
+       cd config && doxygen MagickCore.dox
+       cd config && doxygen MagickWand.dox
+       cd config && doxygen Magick++.dox
 
 #
 # Build Windows source Zip and 7Zip balls
@@ -305,7 +330,7 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
          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)
+  git clone git@git.imagemagick.org:repos/ImageMagick.git $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 if ZIP_DELEGATE
        rm -f $(DIST_WINDOWS_SRC_ZIP)
        $(ZIP) -r -9 -q  $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)