Merge pull request #1387 from akoeplinger/improve-bug652331_2

[mono.git] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index db1e65aabebce9e73eee0a051c974745c57b7e1b..811955257bb529eb63ef9261c61089e99af5ad81 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -13,7 +13,6 @@ ASSEMBLED_DOCS = \
 
 EXTRA_DIST = \
        abc-removal.txt         \
-       AgilityPack.dll         \
        api-style.css           \
        assembly-bundle         \
        check-exports           \
@@ -68,38 +67,46 @@ EXTRA_DIST = \
 dist-hook:
        $(mkdir_p)  $(distdir)/sources
        $(mkdir_p)  $(distdir)/svgs
+       $(mkdir_p)  $(distdir)/HtmlAgilityPack
        cp sources/*  $(distdir)/sources
        cp svgs/*     $(distdir)/svgs
+       cp HtmlAgilityPack/*     $(distdir)/HtmlAgilityPack
 
 clean-local:
-       -rm -Rf $(srcdir)/html
-       -rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe*
-       -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
-       cd $(srcdir) && cp 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
-       cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
 
-mono-file-formats.zip: mono-file-formats.tree
-       @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
-       $(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
+extract: deploy/.stamp
 
 convert.exe: convert.cs AgilityPack.dll
-       cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+       $(TOOL_MAKE) PROFILE=net_4_5 convert.exe
+
+AgilityPack.dll: 
+       $(TOOL_MAKE) PROFILE=net_4_5 AgilityPack.dll