(no commit message)

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 300308c80330b5d3e490040e7db16a1c7eea404a..a9a3f403a8025b3813c5b3ee74e67373ce5b7329 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,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 = \
@@ -191,20 +191,6 @@ uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
        $(HTML_UNINSTALL_DATA_TARGETS) \
        $(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;
-
-uninstall-hook:
-       for CURR_PROG in `echo $(UTILITIES_PGMS) | sed 's/utilities\///g'`; do \
-               rm -f $(DESTDIR)/$(LIB_DIR_PATH)/$$CURR_PROG$(EXEEXT)
-       done;
-       rm -r -f $(LIB_BIN_DIR_PATH)
-
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 
 distclean-local: $(PERLMAGICK_DISTCLEAN_LOCAL_TARGETS)
@@ -253,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 ; \
@@ -297,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