Merge pull request #2698 from esdrubal/iosxmlarray

[mono.git] / mcs / class / monodoc / Makefile

diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
index 9436137d758ccd617cbf7d014de5e88adf9e51df..1c85d9abac643e6f5038fa7815a51c2eac5d7da7 100644 (file)
--- a/mcs/class/monodoc/Makefile
+++ b/mcs/class/monodoc/Makefile
@@ -65,6 +65,7 @@ RESOURCE_FILES = \
        Resources/home.html               \
        Resources/Lminus.gif              \
        Resources/Lplus.gif               \
+       Resources/creativecommons.png     \
        Resources/mdoc-html-format.xsl    \
        Resources/mdoc-html-utils.xsl     \
        Resources/mdoc-sections-css.xsl   \
@@ -77,6 +78,7 @@ RESOURCE_FILES = \
        $(IMAGES)
 
 EXTRA_DISTFILES = \
+       jay.sh \
        monodoc.dll.config.in   \
        $(RESOURCE_FILES)   \
        Monodoc.Ecma/EcmaUrlParser.jay \
@@ -85,9 +87,9 @@ EXTRA_DISTFILES = \
        Test/monodoc_test/trees/tree-from-3-0-old.tree \
        Test/monodoc_test/trees/tree-from-3-0.tree
 
+LIB_REFS = ICSharpCode.SharpZipLib System System.Core System.Xml System.Xml.Linq System.Configuration
 LIB_MCS_FLAGS = \
        /unsafe                                                           \
-       /codepage:utf8                                                    \
        /nowarn:169,164,162,168,219,618,612                               \
        /resource:../../docs/monodoc.xml,monodoc.xml                      \
        /resource:Resources/base.css,base.css                             \
@@ -98,6 +100,7 @@ LIB_MCS_FLAGS = \
        /resource:Resources/home.html,home.html                           \
        /resource:Resources/Lminus.gif,Lminus.gif                         \
        /resource:Resources/Lplus.gif,Lplus.gif                           \
+       /resource:Resources/creativecommons.png,creativecommons.png       \
        /resource:Resources/mdoc-html-format.xsl,mdoc-html-format.xsl     \
        /resource:Resources/mdoc-html-utils.xsl,mdoc-html-utils.xsl       \
        /resource:Resources/mdoc-sections-css.xsl,mdoc-sections-css.xsl   \
@@ -108,15 +111,11 @@ LIB_MCS_FLAGS = \
        /resource:Resources/mono-ecma.xsl,mono-ecma.xsl                   \
        /resource:Resources/toc-html.xsl,toc-html.xsl                     \
        $(IMAGE_RESOURCE_COMMAND)                                                             \
-       /r:ICSharpCode.SharpZipLib                                        \
-       /r:$(corlib)                                                      \
-       /r:System.dll                                                     \
-       /r:System.Core.dll                                                \
-       /r:System.Xml.dll                                                 \
-       /r:System.Xml.Linq.dll                                            \
-       /r:System.Configuration.dll
+       /r:$(corlib)
 
-TEST_MCS_FLAGS = /r:System.dll /r:System.Core.dll /r:System.Xml.dll /r:AgilityPack.dll
+CLEAN_FILES += $(the_lib).config
+
+TEST_MCS_FLAGS = /r:System.dll /r:System.Core.dll /r:System.Xml.dll
 
 DOC_SOURCE_DIRS = \
        ../../docs \
@@ -130,17 +129,15 @@ $(the_lib): Makefile $(RESOURCE_FILES)
 
 all-local: $(the_lib).config Monodoc.Ecma/EcmaUrlParser.cs
 
-run-test-local: AgilityPack.dll
-
-test-local: setup-doc-sources AgilityPack.dll
+test-local: setup-doc-sources
 
 dist-local: Monodoc.Ecma/EcmaUrlParser.cs
 
 $(the_lib).config: Makefile monodoc.dll.config.in
        sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
 
-Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay $(JAY_FLAGS) < $(topdir)/jay/skeleton.cs $< > jay-tmp.out && mv jay-tmp.out $@
+Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
+       $(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
 
 parser.exe: Monodoc.Ecma/EcmaUrlParser.cs Monodoc.Ecma/EcmaUrlTokenizer.cs Monodoc.Ecma/EcmaUrlParserDriver.cs Monodoc.Ecma/EcmaDesc.cs
        mcs /out:$@ /debug $^
@@ -148,6 +145,3 @@ parser.exe: Monodoc.Ecma/EcmaUrlParser.cs Monodoc.Ecma/EcmaUrlTokenizer.cs Monod
 setup-doc-sources: $(DOC_SOURCES)
        mkdir -p ./Test/monodoc_test/sources/
        cp $(DOC_SOURCES) ./Test/monodoc_test/sources/
-
-AgilityPack.dll:
-       cp $(topdir)/../docs/$(@) .