diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | config/commence.in | 1 | ||||
-rw-r--r-- | config/conclude.in | 32 | ||||
-rwxr-xr-x | configure | 6 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | doc/Makefile.in | 70 |
6 files changed, 110 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 181459a..cd4e36a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ VPATH=.:@srcdir@ @COMMENCE@ # Subdirectories in build-order (not including `examples') -SUBDIRS=src test tools @TESTPARALLEL@ +SUBDIRS=src test tools doc @TESTPARALLEL@ ############################################################################## # T A R G E T S diff --git a/config/commence.in b/config/commence.in index 33b0d32..8ea6f3b 100644 --- a/config/commence.in +++ b/config/commence.in @@ -34,6 +34,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +docdir=@exec_prefix@/doc PUB_LIB=$(LIB) # Shared libraries diff --git a/config/conclude.in b/config/conclude.in index 14eb405..fac2121 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -55,6 +55,9 @@ $(includedir): $(bindir): mkdir $@ && chmod 755 $@ +$(DOCDIR): + mkdir $@ && chmod 755 $@ + # Install the library, the public header files, and programs. install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir) @for f in X $(PUB_LIB); do \ @@ -81,6 +84,24 @@ install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir) fi; \ done +# Install the documents. +install-doc: $(PUB_DOCS) $(DOCDIR) + @for d in X $(SUBDIRS); do \ + if test $$d != X; then \ + (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ + done + @for f in X $(PUB_DOCS); do \ + if test $$f != X; then \ + if test -f $$f; then \ + (set -x; $(INSTALL_DATA) $$f $(DOCDIR)/. || exit 1); \ + else \ + (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DOCDIR)/. || \ + exit 1); \ + fi; \ + fi; \ + done + # Removes those things that `make install' (would have) installed. uninstall: @if test "X$(LIB)" != X; then \ @@ -97,6 +118,17 @@ uninstall: done; \ fi +# Removes those things that `make install-doc' (would have) installed. +uninstall-doc: + @for d in X $(SUBDIRS); do \ + if test $$d != X; then \ + (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ + done + @if test "X$(PUB_DOCS)" != X; then \ + set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS); \ + fi + # Removes temporary files without removing the final target files. That is, # remove things like object files but not libraries or executables. # @@ -5784,7 +5784,8 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "src/libhdf5.settings config/depend config/commence config/conclude \ Makefile src/Makefile pablo/Makefile test/Makefile \ - testpar/Makefile tools/Makefile examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + testpar/Makefile tools/Makefile examples/Makefile \ + doc/Makefile doc/html/Makefile doc/html/Tutor/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -5903,7 +5904,8 @@ cat >> $CONFIG_STATUS <<EOF CONFIG_FILES=\${CONFIG_FILES-"src/libhdf5.settings config/depend config/commence config/conclude \ Makefile src/Makefile pablo/Makefile test/Makefile \ - testpar/Makefile tools/Makefile examples/Makefile"} + testpar/Makefile tools/Makefile examples/Makefile \ + doc/Makefile doc/html/Makefile doc/html/Tutor/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index 45a6e43..84dfba5 100644 --- a/configure.in +++ b/configure.in @@ -850,7 +850,8 @@ saved_no_create=$no_create no_create=yes AC_OUTPUT(src/libhdf5.settings config/depend config/commence config/conclude \ Makefile src/Makefile pablo/Makefile test/Makefile \ - testpar/Makefile tools/Makefile examples/Makefile) + testpar/Makefile tools/Makefile examples/Makefile \ + doc/Makefile doc/html/Makefile doc/html/Tutor/Makefile) no_create=$saved_no_create # Then the stamp2 file for H5config.h diff --git a/doc/Makefile.in b/doc/Makefile.in new file mode 100644 index 0000000..766be03 --- /dev/null +++ b/doc/Makefile.in @@ -0,0 +1,70 @@ +# HDF5 Library Doc Makefile(.in) +# +# Copyright (C) 1997 National Center for Supercomputing Applications. +# All rights reserved. +# +# +# This is the top level makefile of the Doc directory. It mostly just +# reinvokes make in the various subdirectories. +# You can alternatively invoke make from each subdirectory manually. +# +# This is just a preliminary version. It turns the "install" and +# "uninstall" targets to "install-doc" and "uninstall-doc" targets +# for subdirectories. This should be revised to more correct +# separate targets as "install-all", "install" and "install-doc" +# whereas "install-all" does both "install" and "install-doc". +# +top_srcdir=@top_srcdir@ +top_builddir=.. +srcdir=@srcdir@ +VPATH=.:@srcdir@ +@COMMENCE@ + +# Subdirectories in build-order +SUBDIRS=html + +##=========================================================================== +lib progs check test _test: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done + +tests TAGS dep depend: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done + +$(docdir): + mkdir $@ && chmod 755 $@ + +install: $(docdir) + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@-doc) || exit 1; \ + done + +uninstall: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@-doc) || exit 1; \ + done + +.PHONY: all lib progs test _test install uninstall dep depend clean \ + mostlyclean distclean maintainer-clean + +clean mostlyclean: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@); \ + done + +distclean: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@); \ + done + -$(RM) Makefile + +maintainer-clean: distclean + @echo "This target is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@); \ + done + |