'make doc' now removes the need for the rebuild-doc script.

Signed-off-by: Rok Strnisa <rok.strnisa@citrix.com>

diff --git a/Makefile b/Makefile
index 6605ac9f069fcbcbba301ee425e3358007992d22..4a7bff04f59f5bab4236ba2bfef1a2a741db8deb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Set this to some other value on systems with no Xen libs to
 # build only the client stuff and the fakeserver.
-COMPILE_XENSTUFF ?= yes
+COMPILE_XENSTUFF=yes
 export COMPILE_XENSTUFF
 
 PRODUCT_VERSION?=unknown
@@ -22,10 +22,6 @@ all: version
 phase3:
        omake phase3
 
-.PHONY: api
-api: all
-       @ :
-
 .PHONY: xapimon
 xapimon:
        omake ocaml/xapimon/xapimon
@@ -70,11 +66,21 @@ otags:
        otags -vi -r . -o tags
 
 .PHONY: doc
-# For the doc target, we need to have phase2 done in case autogenerated .ml files are required
-doc:
-       omake ocaml/util/version.ml
-       omake phase1 phase2
+doc: api-doc api-libs-doc
+
+.PHONY: api-doc
+api-doc: version import-v6
+       omake phase1 phase2 # autogenerated files might be required
        omake doc
+
+.PHONY: api-libs-doc
+api-libs-doc:
+       @(cd ../xen-api-libs.hg 2> /dev/null && $(MAKE) doc) || \
+        (echo ">>> If you have a myclone of xen-api-libs, its documentation will be included. <<<")
+
+.PHONY: import-v6
+import-v6:
+       cd /myrepos/v6.hg; ./install.sh . ../xen-api.hg/
  
 .PHONY: version
 version:

diff --git a/rebuild-docs b/rebuild-docs
deleted file mode 100755 (executable)
index c1cf9e9..0000000
--- a/rebuild-docs
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-echo "This is just a temporary fix. Ideally, the effect would be the same when"
-echo "just running the following command: make doc."
-
-echo "[Installing v6 proprietary code...]"
-cd /myrepos/v6.hg
-./install.sh . ../xen-api.hg/
-
-echo "[Making xen-api documentation...]"
-cd ../xen-api.hg
-make doc
-
-if [ -e ../xen-api-libs.hg ]
-then
-  echo "[Found xen-api-libs.hg: making its documentation...]"
-  cd ../xen-api-libs.hg
-  make doc
-  cd ../xen-api.hg
-fi
-
-echo "Open 'ocaml/doc/index.html' to explore the generated documentation."