The variable ValueSize is set to 1 on both code paths, and then

[oota-llvm.git] / docs / Makefile

diff --git a/docs/Makefile b/docs/Makefile
index 1b5987914dc1ff30776771a05050f02344f0c2ae..8f7d6171d3b336e7c7c5882028d91de656edd5d2 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL      := ..
-DIRS       := CommandGuide
+DIRS       := CommandGuide tutorial
 
 ifdef BUILD_FOR_WEBSITE
 PROJ_OBJ_DIR = .
@@ -31,7 +31,7 @@ DOXYFILES  := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \
               doxygen.intro
 EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide img
 
-.PHONY: install-html install-doxygen doxygen install-ocamldoc ocamldoc
+.PHONY: install-html install-doxygen doxygen install-ocamldoc ocamldoc generated
 
 install_targets := install-html
 ifeq ($(ENABLE_DOXYGEN),1)
@@ -42,13 +42,17 @@ install_targets += install-ocamldoc
 endif
 install-local:: $(install_targets)
 
+# Live documentation is generated for the web site using this target:
+# 'make generated BUILD_FOR_WEBSITE=1'
+generated:: doxygen ocamldoc
+
 install-html: $(PROJ_OBJ_DIR)/html.tar.gz
        $(Echo) Installing HTML documentation
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
-       $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
-       $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+       $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+       $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
 
 $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
        $(Echo) Packaging HTML documentation
@@ -59,11 +63,11 @@ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
 
 install-doxygen: doxygen
        $(Echo) Installing doxygen documentation
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
-       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
        $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
          $(FIND) . -type f -exec \
-           $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+           $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
 
 doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
 
@@ -90,13 +94,18 @@ $(LLVM_SRC_ROOT)/docs/userloc.html:
 
 install-ocamldoc: ocamldoc
        $(Echo) Installing ocamldoc documentation
-       $(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
-       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
+       $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
        $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
          $(FIND) . -type f -exec \
-           $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+           $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
 
-ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
+ocamldoc: regen-ocamldoc
+       $(Echo) Packaging ocamldoc documentation
+       $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar*
+       $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc
+       $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar
+       $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/
 
 regen-ocamldoc:
        $(Echo) Building ocamldoc documentation
@@ -109,9 +118,6 @@ regen-ocamldoc:
                $(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
                `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" -exec echo -load '{}' ';'`
 
-$(PROJ_OBJ_DIR)/ocamldoc.tar.gz:
-       $(Echo) Packaging ocamldoc documentation
-       $(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/ocamldoc.tar
-       $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc
-       $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar
-       $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/
+uninstall-local::
+       $(Echo) Uninstalling Documentation
+       $(Verb) $(RM) -rf $(DESTDIR)$(PROJ_docsdir)