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 07f15168b56ff3d17fe942151cd8f1e599d2a464..811955257bb529eb63ef9261c61089e99af5ad81 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,8 @@
 sourcesdir = $(prefix)/lib/monodoc/sources
 
 sources_DATA = \
+       mono-file-formats.source \
+       mono-tools.source \
        monoapi.source \
        $(ASSEMBLED_DOCS)
 
@@ -11,8 +13,6 @@ ASSEMBLED_DOCS = \
 
 EXTRA_DIST = \
        abc-removal.txt         \
-       AgilityPack.dll         \
-       aot-compiler.txt        \
        api-style.css           \
        assembly-bundle         \
        check-exports           \
@@ -23,7 +23,6 @@ EXTRA_DIST = \
        docs.make               \
        documented              \
        embedded-api            \
-       exception-handling.txt  \
        exceptions              \
        exdoc                   \
        file-share-modes        \
@@ -34,15 +33,17 @@ EXTRA_DIST = \
        internal-calls          \
        ir-desc                 \
        jit-imt                 \
-       jit-regalloc            \
        jit-thoughts            \
        jit-trampolines         \
        local-regalloc.txt      \
        magic.diff              \
        mini-doc.txt            \
-       mini-porting.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           \
@@ -57,7 +58,6 @@ EXTRA_DIST = \
        ssapre.txt              \
        stack-alignment         \
        stack-overflow.txt      \
-       thread-safety.txt       \
        threading               \
        toc.xml                 \
        TODO                    \
@@ -67,35 +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)
 
-monoapi.zip : monoapi.tree
-monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp
-       cp api-style.css deploy
-       cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
+TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
 
-mono-tools.zip : mono-tools.tree
-mono-tools.tree: docs.make Makefile.am deploy/.stamp
-       cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
+monoapi.zip: monoapi.tree
 
-mono-file-formats.zip : mono-file-formats.tree
-mono-file-formats.tree: docs.make Makefile.am deploy/.stamp
-       cd $(srcdir) && $(MAKE) -f $< 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) $@
 
-$(srcdir)/deploy/.stamp: convert.exe Makefile.am
-       $(mkdir_p) $(srcdir)/html
+mono-tools.zip: mono-tools.tree
+
+mono-tools.tree: $(srcdir)/docs.make Makefile.am deploy/.stamp 
+       $(TOOL_MAKE) $@
+
+mono-file-formats.zip: mono-file-formats.tree 
+
+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
+       $(TOOL_MAKE) PROFILE=net_4_5 convert.exe
 
-convert.exe: docs.make convert.cs Makefile.am
-       cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+AgilityPack.dll: 
+       $(TOOL_MAKE) PROFILE=net_4_5 AgilityPack.dll