X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=docs%2FMakefile.am;h=9c514420403427864d1c3e36e808f0371b6c01c4;hb=facbf81e0589bd1a854bec2336caa0d4c061b801;hp=c0450027cfd9498e0990bdfe2dd93d483c5329a5;hpb=8ef4e4703172fd32ada3f74b22df5203b4683493;p=mono.git

diff --git a/docs/Makefile.am b/docs/Makefile.am
index c0450027cfd..9c514420403 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -14,7 +14,6 @@ ASSEMBLED_DOCS = \
 EXTRA_DIST = \
 	abc-removal.txt		\
 	api-style.css		\
-	assembly-bundle		\
 	check-exports		\
 	check-coverage		\
 	convert.cs		\
@@ -23,7 +22,6 @@ EXTRA_DIST = \
 	docs.make		\
 	documented		\
 	embedded-api		\
-	exceptions		\
 	exdoc			\
 	file-share-modes	\
 	gc-issues		\
@@ -35,33 +33,25 @@ EXTRA_DIST = \
 	jit-imt			\
 	jit-thoughts		\
 	jit-trampolines		\
-	local-regalloc.txt	\
-	magic.diff		\
 	mini-doc.txt		\
 	mono-api-metadata.html	\
 	mono-file-formats.config\
 	mono-file-formats.source\
-	mono_handle_d		\
 	mono-tools.config       \
 	mono-tools.source       \
 	monoapi.source		\
-	new-regalloc		\
 	object-layout		\
-	opcode-decomp.txt	\
 	precise-gc		\
 	produce-lists		\
 	public			\
 	public-api		\
 	README			\
-	release-notes-1.0.html	\
 	remoting		\
 	ssapre.txt		\
-	stack-alignment		\
 	stack-overflow.txt	\
 	threading		\
 	toc.xml			\
 	TODO			\
-	tree-mover.txt		\
 	unmanaged-calls	
 
 dist-hook:
@@ -73,41 +63,40 @@ dist-hook:
 	cp HtmlAgilityPack/*     $(distdir)/HtmlAgilityPack
 
 clean-local:
-	-rm -Rf $(srcdir)/html
-	-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* $(srcdir)/AgilityPack.dll*
-	-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
+	-rm -Rf html
+	-rm -f deploy/* convert.exe* AgilityPack.dll*
+	-rm -f $(ASSEMBLED_DOCS)
+
+TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
 
 monoapi.zip: monoapi.tree
-	@test -f $@ || { rm -f $(srcdir)/monoapi.tree && $(MAKE) monoapi.tree; }
-monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp perms
-	cd $(srcdir) && cp -f api-style.css deploy
-	cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
+
+monoapi.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/toc.xml $(srcdir)/deploy/.stamp 
+	-mkdir -p deploy
+	cp -f $(srcdir)/api-style.css deploy
+	$(TOOL_MAKE) $@
 
 mono-tools.zip: mono-tools.tree
-	@test -f $@ || { rm -f $(srcdir)/mono-tools.tree && $(MAKE) mono-tools.tree; }
-mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp perms
-	cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
 
-mono-file-formats.zip: mono-file-formats.tree perms
-	@test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree && $(MAKE) mono-file-formats.tree; }
-mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
-	cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
+mono-tools.tree: $(srcdir)/docs.make Makefile.am deploy/.stamp 
+	$(TOOL_MAKE) $@
+
+mono-file-formats.zip: mono-file-formats.tree 
 
-$(srcdir)/deploy/.stamp: convert.exe Makefile.am perms
-	$(mkdir_p) $(srcdir)/html
+mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp
+	$(TOOL_MAKE) $@
+
+deploy/.stamp: convert.exe Makefile.am 
+	$(mkdir_p) html
 	runtimedir=`cd ../runtime && pwd`; export runtimedir; \
-	cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
+	MONO_PATH=../mcs/class/lib/net_4_5 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
 	touch $@
 
-extract: $(srcdir)/deploy/.stamp
-
-convert.exe: convert.cs AgilityPack.dll perms
-	cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+extract: deploy/.stamp
 
-AgilityPack.dll: perms
-	cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) AgilityPack.dll
+convert.exe: convert.cs AgilityPack.dll
+	$(TOOL_MAKE) PROFILE=net_4_5 convert.exe
 
-.PHONY: perms
-perms:
-	-@test -w $(srcdir) || chmod a+w $(srcdir)
+AgilityPack.dll: 
+	$(TOOL_MAKE) PROFILE=net_4_5 AgilityPack.dll