[svn-r11085] Purpose:

Bug fix

Description:
Update Makefiles now that docs are no longer in main hdf5 tree.

Solution:
Changed root-level Makefile.am not to recurse into docs tree.
Removed docs Makefiles from configure.in.
Removed config/commence-doc.am, since it is no longer used.

Platforms tested:
mir (change to Makefiles only)

5 files changed, 23 insertions, 80 deletions

diff --git a/Makefile.am b/Makefile.am
index 63786e0..a05876b 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,8 +39,8 @@ include $(top_srcdir)/config/commence.am
 # Define subdirectories to build.
 ## Automake understands that `make distclean' should recurse into
 ## conditional subdirectories even if `make all' does not.
-## We need to list examples and doc in the DIST_SUBDIRS variable
-## so that they also will be visited by `make distclean'
+## We need to list the examples directory in the DIST_SUBDIRS variable
+## so that it will be visited by `make distclean'
 # Add this directory to SUBDIRS so that examples get built after tools
 # but before examples in extra interfaces (c++ and fortran).
 # Since we're explicitly listing DIST_SUBDIRS, we also need to list
@@ -73,8 +73,7 @@ endif
 
 SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
          $(HDF5_HL_DIR)
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples  \
-          doc 
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES=src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
@@ -105,29 +104,29 @@ install-exec-local:
 uninstall-local:
 	cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
 
-# Clean and mostlyclean need to recurse into docs, examples, and perform
+# Clean and mostlyclean need to recurse into examples and perform
 # directories unless they've already been distcleaned.
 clean-local:
-	@@SETX@; for d in docs examples perform; do                     \
+	@@SETX@; for d in examples perform; do                          \
 	  if test -f $$d/Makefile; then                                 \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1;        \
 	  fi;                                                           \
 	done
 
 mostlyclean-local:
-	@@SETX@; for d in docs examples perform; do                     \
+	@@SETX@; for d in examples perform; do                          \
 	  if test -f $$d/Makefile; then                                 \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1;  \
 	  fi;                                                           \
 	done
 
-# 'make install-all' also installs docs and examples
+# 'make install-all' also installs examples
 install-all:
 	$(MAKE) $(AM_MAKEFLAGS) install
-	$(MAKE) $(AM_MAKEFLAGS) install-doc
+	$(MAKE) $(AM_MAKEFLAGS) install-examples
 uninstall-all:
 	$(MAKE) $(AM_MAKEFLAGS) uninstall
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-doc
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 # Install examples in this directory and recursively
 install-examples uninstall-examples:
@@ -135,14 +134,12 @@ install-examples uninstall-examples:
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
 	done
 
-# Install documentation and examples
+# Placeholder to remind users that docs are now in a separate repository.
 install-doc:
-	$(MAKE) $(AM_MAKEFLAGS) install-examples
-	(cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	echo "docs no longer live in this tree.  Use install-examples to install examples."
 
 uninstall-doc:
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-	(cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	echo "docs no longer live in this tree.  Use install-examples to install examples."
 
 # `make check-install' or `make installcheck' checks that examples can 
 #  be successfully built
diff --git a/Makefile.in b/Makefile.in
index ae2897f..a61a837 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -334,9 +334,7 @@ MOSTLYCLEANFILES = *.chkexe *.chksh
 SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
          $(HDF5_HL_DIR)
 
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples  \
-          doc 
-
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES = src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
@@ -786,29 +784,29 @@ install-exec-local:
 uninstall-local:
 	cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
 
-# Clean and mostlyclean need to recurse into docs, examples, and perform
+# Clean and mostlyclean need to recurse into examples and perform
 # directories unless they've already been distcleaned.
 clean-local:
-	@@SETX@; for d in docs examples perform; do                     \
+	@@SETX@; for d in examples perform; do                          \
 	  if test -f $$d/Makefile; then                                 \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1;        \
 	  fi;                                                           \
 	done
 
 mostlyclean-local:
-	@@SETX@; for d in docs examples perform; do                     \
+	@@SETX@; for d in examples perform; do                          \
 	  if test -f $$d/Makefile; then                                 \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1;  \
 	  fi;                                                           \
 	done
 
-# 'make install-all' also installs docs and examples
+# 'make install-all' also installs examples
 install-all:
 	$(MAKE) $(AM_MAKEFLAGS) install
-	$(MAKE) $(AM_MAKEFLAGS) install-doc
+	$(MAKE) $(AM_MAKEFLAGS) install-examples
 uninstall-all:
 	$(MAKE) $(AM_MAKEFLAGS) uninstall
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-doc
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 # Install examples in this directory and recursively
 install-examples uninstall-examples:
@@ -816,14 +814,12 @@ install-examples uninstall-examples:
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
 	done
 
-# Install documentation and examples
+# Placeholder to remind users that docs are now in a separate repository.
 install-doc:
-	$(MAKE) $(AM_MAKEFLAGS) install-examples
-	(cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	echo "docs no longer live in this tree.  Use install-examples to install examples."
 
 uninstall-doc:
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
-	(cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	echo "docs no longer live in this tree.  Use install-examples to install examples."
 
 # `make check-install' or `make installcheck' checks that examples can 
 #  be successfully built
diff --git a/config/commence-doc.am b/config/commence-doc.am
deleted file mode 100644
index f3dea24..0000000
--- a/config/commence-doc.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## config/commence-doc.am
-## This file supplies Makefile.am files in the doc directory (and subdirectories)
-## with the rules they need.
-
-include $(top_srcdir)/config/commence.am
-
-# Ignore most rules
-lib progs check test _test check-p check-s:
-	@echo "Nothing to be done"
-
-tests dep depend:
-	@@SETX@; for d in X $(SUBDIRS); do                                  \
-	  if test $$d != X; then                                            \
-	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;               \
-	  fi;     
-	done
-
-# In docs directory, install-doc is the same as install
-install-doc install-all:
-	$(MAKE) $(AM_MAKEFLAGS) install
-uninstall-doc uninstall-all:
-	$(MAKE) $(AM_MAKEFLAGS) uninstall
diff --git a/configure b/configure
index 4e7c960..4c0f1ab 100755
--- a/configure
+++ b/configure
@@ -50757,7 +50757,7 @@ if test -n "$TESTPARALLEL"; then
   fi
 fi
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/gifconv/Makefile examples/Makefile doc/Makefile doc/html/Makefile doc/html/ed_libs/Makefile doc/html/ed_styles/Makefile doc/html/ADGuide/Makefile doc/html/Graphics/Makefile doc/html/Intro/Makefile doc/html/PSandPDF/Makefile doc/html/TechNotes/Makefile doc/html/Tutor/Makefile doc/html/Tutor/Graphics/Makefile doc/html/Tutor/examples/Makefile doc/html/cpplus/Makefile doc/html/fortran/Makefile c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile hl/Makefile hl/src/Makefile hl/test/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/gifconv/Makefile examples/Makefile c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile hl/Makefile hl/src/Makefile hl/test/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -51389,20 +51389,6 @@ do
   "tools/misc/testh5repart.sh" ) CONFIG_FILES="$CONFIG_FILES tools/misc/testh5repart.sh" ;;
   "tools/gifconv/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gifconv/Makefile" ;;
   "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "doc/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;;
-  "doc/html/ed_libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/ed_libs/Makefile" ;;
-  "doc/html/ed_styles/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/ed_styles/Makefile" ;;
-  "doc/html/ADGuide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/ADGuide/Makefile" ;;
-  "doc/html/Graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Graphics/Makefile" ;;
-  "doc/html/Intro/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Intro/Makefile" ;;
-  "doc/html/PSandPDF/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/PSandPDF/Makefile" ;;
-  "doc/html/TechNotes/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/TechNotes/Makefile" ;;
-  "doc/html/Tutor/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Tutor/Makefile" ;;
-  "doc/html/Tutor/Graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Tutor/Graphics/Makefile" ;;
-  "doc/html/Tutor/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/Tutor/examples/Makefile" ;;
-  "doc/html/cpplus/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/cpplus/Makefile" ;;
-  "doc/html/fortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/html/fortran/Makefile" ;;
   "c++/Makefile" ) CONFIG_FILES="$CONFIG_FILES c++/Makefile" ;;
   "c++/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES c++/src/Makefile" ;;
   "c++/src/h5c++" ) CONFIG_FILES="$CONFIG_FILES c++/src/h5c++" ;;
diff --git a/configure.in b/configure.in
index d160737..3349078 100644
--- a/configure.in
+++ b/configure.in
@@ -2998,20 +2998,6 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  tools/misc/testh5repart.sh
                  tools/gifconv/Makefile
                  examples/Makefile
-                 doc/Makefile
-                 doc/html/Makefile
-                 doc/html/ed_libs/Makefile
-                 doc/html/ed_styles/Makefile
-                 doc/html/ADGuide/Makefile
-                 doc/html/Graphics/Makefile
-                 doc/html/Intro/Makefile
-                 doc/html/PSandPDF/Makefile
-                 doc/html/TechNotes/Makefile
-                 doc/html/Tutor/Makefile
-                 doc/html/Tutor/Graphics/Makefile
-                 doc/html/Tutor/examples/Makefile
-                 doc/html/cpplus/Makefile
-                 doc/html/fortran/Makefile
                  c++/Makefile
                  c++/src/Makefile
                  c++/src/h5c++