[System.Xml] Use profile-specific file names for generated files.

Otherwise parallel builds will break randomly.

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 2160578776c31fc576d2664c0e0f05dcf94b9946..c52a56468ffe7eace41f8bd470fb029c2ec83a35 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -65,8 +65,8 @@ EXTRA_DISTFILES = \
        $(xmlfiles_files:%=Test/XmlFiles/%) \
        $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
-System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       (cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> Parser.cs)
+System.Xml.XPath/$(PROFILE)_Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
+       (cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> $(PROFILE)_Parser.cs)
 
 Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        sed "s/\%start Expr/\%start Pattern/" $< >$@
@@ -80,12 +80,12 @@ Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
        cat $< >>$@
 
 ifneq (moonlight_raw, $(PROFILE))
-BUILT_SOURCES = System.Xml.XPath/Parser.cs \
+BUILT_SOURCES = System.Xml.XPath/$(PROFILE)_Parser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
 
 CLEAN_FILES = Test/XmlFiles/xsl/result.xml \
-       System.Xml.XPath/Parser.cs \
+       System.Xml.XPath/$(PROFILE)_Parser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
 endif

diff --git a/mcs/class/System.XML/System.Xml.XPath/.gitignore b/mcs/class/System.XML/System.Xml.XPath/.gitignore
index ac16218ced330daca06dd545e6c5eb5f140adf8d..9affbc6415d3ba82f58bd0669a9c303ee0e9505e 100644 (file)
--- a/mcs/class/System.XML/System.Xml.XPath/.gitignore
+++ b/mcs/class/System.XML/System.Xml.XPath/.gitignore
@@ -1 +1 @@
-/Parser.cs
+/*_Parser.cs