...

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5cafc508c5206f3e99bea972c2ff26f9d11bf541..dfc817d6c3288c98d011f5d8ca7cfb861be3f45b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-#  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2018 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,
@@ -108,6 +108,7 @@ TOP_EXTRA_DIST = \
        Platforms.txt \
        README.txt \
        index.html \
+       gitversion.sh \
        version.sh \
        winpath.sh
 
@@ -186,14 +187,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)
 
@@ -231,7 +227,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 \
          ) \
@@ -244,7 +240,7 @@ dist-hook:
 # Install HTML files
 pkgdocdir = $(DOCUMENTATION_PATH)
 DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand
-DOCDIRSMANUAL = images images/patterns www www/api www/source www/Magick++
+DOCDIRSMANUAL = images images/patterns www www/assets www/api www/source www/Magick++
 DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 
 if INSTALL_DOC
@@ -289,7 +285,7 @@ magick-version: MagickCore/version.h
        fi ; \
        touch magick-version
 
-${srcdir}/configure: ${srcdir}/version.sh
+${srcdir}/configure: ${srcdir}/version.sh ${srcdir}/gitversion.sh
 
 # Automagically reconfigure libtool
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -297,19 +293,25 @@ libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
 # Format C API documentation
-html:
-       $(MKDIR_P) -p $(top_builddir)/www/api
-       cd config && doxygen MagickCore.dox
-       cd config && doxygen MagickWand.dox
-       cd config && doxygen 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 -f $(top_srcdir)/$$file $(top_builddir)/$$dir ; \
+                               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
@@ -329,7 +331,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)
@@ -346,7 +348,7 @@ endif # P7ZIP_DELEGATE
 #
 if RPM_DELEGATE
 
-DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
+DIST_ARCHIVE_SRPM=$(distdir).src.rpm
 .PHONY: srpm
 $(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
        rm -f $(DIST_ARCHIVE_SRPM)
@@ -387,4 +389,4 @@ snapshot: distcheck
        $(MAKE) $(DIST_ARCHIVE_SRPM)
        $(MAKE) $(DIST_WINDOWS_SRC_ZIP)
        $(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
-       mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/alpha/
+       mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/beta/