docs: network diagrams for the wiki

We provide two new diagrams
  docs/figs/network-{bridge,basic}.fig
which are converted to pngs by the Makefiles and intended for
consumption by http://wiki.xen.org/wiki/Xen_Networking.

This is perhaps not the ideal location for this source code but we
don't have a better one.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/.gitignore b/.gitignore
index 380f4d84c23399bdec3bad5093f7220001addab4..f6edc43f32a920b3771d1afbf6a8be9454868a00 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -374,3 +374,4 @@ tools/xenstore/xenstore-watch
 
 docs/txt/misc/*.txt
 docs/txt/man/*.txt
+docs/figs/*.png

diff --git a/.hgignore b/.hgignore
index 9bed2711a91db2789dff028ab04a932dca2221b7..344792a7b122aed0f671ba8bb646b3dd2bf6bbd7 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -45,6 +45,7 @@
 ^docs/interface/interface\.css$
 ^docs/interface/interface\.html$
 ^docs/interface/labels\.pl$
+^docs/figs/.*\.png
 ^docs/man1/
 ^docs/man5/
 ^docs/pdf/.*$

diff --git a/docs/Makefile b/docs/Makefile
index 007a5a9c00c553373460d08e6a6c7670965cb6ed..8806990c9626521b8923cae58fef26c3b5150503 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ DOC_TXT         := $(patsubst %.txt,txt/%.txt,$(wildcard misc/*.txt)) \
 all: build
 
 .PHONY: build
-build: html txt man-pages
+build: html txt man-pages figs
        @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
@@ -40,6 +40,10 @@ html: $(DOC_HTML) html/index.html
 .PHONY: txt
 txt: $(DOC_TXT)
 
+.PHONY: figs
+figs:
+       $(MAKE) -C figs
+
 .PHONY: python-dev-docs
 python-dev-docs:
        @mkdir -v -p api/tools/python
@@ -68,6 +72,7 @@ man5/%.5: man/%.pod.5 Makefile
 .PHONY: clean
 clean:
        $(MAKE) -C xen-api clean
+       $(MAKE) -C figs clean
        rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
        rm -rf *.ilg *.log *.ind *.toc *.bak core
        rm -rf html txt