WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] Integrate the Xen-API doc into the build.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Integrate the Xen-API doc into the build.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 30 Jan 2007 06:00:34 -0800
Delivery-date: Tue, 30 Jan 2007 06:02:30 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1169922401 0
# Node ID ea3c752045555180c2de41913e5efeabd424d0cf
# Parent  965cdfff68b04deba4078c89b9e01065bdb9b49e
Integrate the Xen-API doc into the build.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 docs/Docs.mk          |   12 ++++++++++++
 docs/Makefile         |   19 ++++++++-----------
 docs/xen-api/Makefile |   31 +++++++++++++++++++++++++------
 3 files changed, 45 insertions(+), 17 deletions(-)

diff -r 965cdfff68b0 -r ea3c75204555 docs/Docs.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/Docs.mk      Sat Jan 27 18:26:41 2007 +0000
@@ -0,0 +1,12 @@
+PS2PDF         := ps2pdf
+DVIPS          := dvips
+LATEX          := latex
+FIG2DEV                := fig2dev
+LATEX2HTML     := latex2html
+DOXYGEN                := doxygen
+POD2MAN                := pod2man
+DOT            := dot
+
+pkgdocdir      := /usr/share/doc/xen
+mandir         := /usr/share/man
+
diff -r 965cdfff68b0 -r ea3c75204555 docs/Makefile
--- a/docs/Makefile     Sat Jan 27 15:02:00 2007 +0000
+++ b/docs/Makefile     Sat Jan 27 18:26:41 2007 +0000
@@ -2,19 +2,9 @@
 
 XEN_ROOT=..
 include $(XEN_ROOT)/Config.mk
+include $(XEN_ROOT)/docs/Docs.mk
 
 VERSION                = xen-unstable
-
-PS2PDF         := ps2pdf
-DVIPS          := dvips
-LATEX          := latex
-FIG2DEV                := fig2dev
-LATEX2HTML     := latex2html
-DOXYGEN                := doxygen
-POD2MAN                := pod2man
-
-pkgdocdir      := /usr/share/doc/xen
-mandir         := /usr/share/man
 
 DOC_MAN5SRC    := $(wildcard man/*.pod.5)
 DOC_MAN1SRC    := $(wildcard man/*.pod.1)
@@ -32,6 +22,9 @@ all: build
 
 .PHONY: build
 build: ps pdf html man-pages
+       @if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
+       $(MAKE) -C xen-api build ; else                              \
+        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
        rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
 .PHONY: dev-docs
@@ -74,6 +67,7 @@ man5/%.5: man/%.pod.5 Makefile
 
 .PHONY: clean
 clean:
+       $(MAKE) -C xen-api clean
        rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
        rm -rf *.ilg *.log *.ind *.toc *.bak core
        rm -rf $(GFX) ps pdf html
@@ -88,6 +82,9 @@ install: all
 install: all
        rm -rf $(DESTDIR)$(pkgdocdir)
        $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
+
+       $(MAKE) -C xen-api install
+
        cp -dR ps $(DESTDIR)$(pkgdocdir)
        cp -dR pdf $(DESTDIR)$(pkgdocdir)
        $(INSTALL_DIR) $(DESTDIR)$(mandir)
diff -r 965cdfff68b0 -r ea3c75204555 docs/xen-api/Makefile
--- a/docs/xen-api/Makefile     Sat Jan 27 15:02:00 2007 +0000
+++ b/docs/xen-api/Makefile     Sat Jan 27 18:26:41 2007 +0000
@@ -1,22 +1,41 @@ TEX := $(wildcard *.tex)
+#!/usr/bin/make -f
+
+XEN_ROOT=../..
+include $(XEN_ROOT)/Config.mk
+include $(XEN_ROOT)/docs/Docs.mk
+
+
 TEX := $(wildcard *.tex)
 EPS := $(wildcard *.eps)
 EPSDOT := $(patsubst %.dot,%.eps,$(wildcard *.dot))
 
 .PHONY: all
-all: xenapi.pdf xenapi.ps
+all: build
+
+.PHONY: build
+build: xenapi.pdf xenapi.ps
+
+install:
+       $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/ps
+       $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/pdf
+
+       cp xenapi.ps $(DESTDIR)$(pkgdocdir)/ps
+       cp xenapi.pdf $(DESTDIR)$(pkgdocdir)/pdf
+
 
 xenapi.dvi: $(TEX) $(EPS) $(EPSDOT)
-       latex xenapi.tex
-       latex xenapi.tex
+       $(LATEX) xenapi.tex
+       $(LATEX) xenapi.tex
+       rm -f *.aux *.log
 
 %.pdf: %.ps
-       ps2pdf $< $@
+       $(PS2PDF) $< $@
 
 %.ps: %.dvi
-       dvips $< -o $@
+       $(DVIPS) $< -o $@
 
 %.eps: %.dot
-       dot -Tps $< >$@
+       $(DOT) -Tps $< >$@
 
 .PHONY: clean
 clean:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Integrate the Xen-API doc into the build., Xen patchbot-unstable <=