(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8de512ccc9f1b49ba53562ac5594b7d2591aa9f3..5c6aba078aea9c42fc7e849920b4f0600f83a62e 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12369:12371M"
+#define MagickSVNRevision  "12369:12376M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/Makefile.am b/Makefile.am
index 58bb26be0f263454784e5f3003afc8ab1a3079e7..a9a3f403a8025b3813c5b3ee74e67373ce5b7329 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,14 +239,21 @@ 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/api www/source www/Magick++
+DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 HTML_INSTALL_DATA_TARGETS = install-data-html
 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 ; \
@@ -283,9 +290,18 @@ libtool: $(LIBTOOL_DEPS)
 
 # Format C API documentation
 html:
-       doxygen config/MagickCore.dox
-       doxygen config/MagickWand.dox
-       doxygen config/Magick++.dox
+       $(MKDIR_P) -p $(top_builddir)/www/api
+       cd config && doxygen MagickCore.dox
+       cd config && doxygen MagickWand.dox
+       cd config && doxygen Magick++.dox
+       for dir in $(DOCDIRSMANUAL) ; do \
+               $(MKDIR_P) $(top_builddir)/$$dir ;\
+               for file in $$dir/*.* ; do \
+                       if ! test -f $(top_builddir)/$$file; then \
+                               cp -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+                       fi; \
+               done ; \
+       done;
 
 #
 # Build Windows source Zip and 7Zip balls

diff --git a/Makefile.in b/Makefile.in
index 547ccc70bb0768bb165a071c5c9c35af1c6356ec..4b78ca6a1666d05519340e298f992f2d039beae8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5014,7 +5014,9 @@ DISTDIRS = images scripts www PerlMagick
 
 # 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/api www/source www/Magick++
+DOCDIRS = $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 HTML_INSTALL_DATA_TARGETS = install-data-html
 
 # Uninstall HTML files
@@ -10885,7 +10887,12 @@ install-data-html:
        $(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 ; \
@@ -10916,9 +10923,18 @@ libtool: $(LIBTOOL_DEPS)
 
 # Format C API documentation
 html:
-       doxygen config/MagickCore.dox
-       doxygen config/MagickWand.dox
-       doxygen config/Magick++.dox
+       $(MKDIR_P) -p $(top_builddir)/www/api
+       cd config && doxygen MagickCore.dox
+       cd config && doxygen MagickWand.dox
+       cd config && doxygen Magick++.dox
+       for dir in $(DOCDIRSMANUAL) ; do \
+               $(MKDIR_P) $(top_builddir)/$$dir ;\
+               for file in $$dir/*.* ; do \
+                       if ! test -f $(top_builddir)/$$file; then \
+                               cp -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+                       fi; \
+               done ; \
+       done;
 $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
        if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
          chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \

diff --git a/config/Magick++.dox.in b/config/Magick++.dox.in
index 2ce69b849067a5fb8398b3c77232913c9d94d024..81894a707a5b25b02a8a0163679fa43ecc8b792c 100644 (file)
--- a/config/Magick++.dox.in
+++ b/config/Magick++.dox.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.1.1
+../# Doxyfile 1.8.1.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = www/api
+OUTPUT_DIRECTORY       = ../www/api
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -655,7 +655,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/Magick++
+INPUT                  = @srcdir@/../Magick++
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/config/MagickCore.dox.in b/config/MagickCore.dox.in
index bf15c3d2f7450ec7964eda676c16d9fc4ead8e4a..2e4ebdb6120afdf04bf42208852d02dd48a7aef6 100644 (file)
--- a/config/MagickCore.dox.in
+++ b/config/MagickCore.dox.in
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = www/api
+OUTPUT_DIRECTORY       = ../www/api
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -655,7 +655,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/MagickCore
+INPUT                  = @srcdir@/../MagickCore
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/config/MagickWand.dox.in b/config/MagickWand.dox.in
index 5ad547d5b06b6a67438c232e6bf817cd3b716a61..f608152feead238da00d0f9d874ba847f724587d 100644 (file)
--- a/config/MagickWand.dox.in
+++ b/config/MagickWand.dox.in
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = www/api
+OUTPUT_DIRECTORY       = ../www/api
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -655,7 +655,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/MagickWand
+INPUT                  = @srcdir@/../MagickWand
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/configure b/configure
index eaedf7def0de4739ee9db44e2d36626f116fc8e1..1b45bd8d908b2eea45067723589e759744dcfd4a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3679,7 +3679,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12369:12371M
+MAGICK_SVN_REVISION=12369:12376M
 
 
 # Substitute library versioning