[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 fcda3233f58e3b0f7912560682fe4012fd52b100..19a7080939f76bfbb1db7ed67a7f50027773237d 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -79,26 +79,26 @@ EXTRA_DISTFILES = \
 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)
 
-Mono.Xml.Xsl/PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
+Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        sed "s/\%start Expr/\%start Pattern/" $< >$@
 
-Mono.Xml.Xsl/PatternParser.cs: Mono.Xml.Xsl/PatternParser.jay $(topdir)/jay/skeleton.cs
+Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs: Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay $(topdir)/jay/skeleton.cs
        echo "#define XSLT_PATTERN" > $@
-       (cd Mono.Xml.Xsl; $(topdir)/../jay/jay -ct PatternParser.jay < $(topdir)/../jay/skeleton.cs >> PatternParser.cs)
+       (cd Mono.Xml.Xsl; $(topdir)/../jay/jay -ct $(PROFILE)_PatternParser.jay < $(topdir)/../jay/skeleton.cs >> $(PROFILE)_PatternParser.cs)
 
-Mono.Xml.Xsl/PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
+Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
        echo "#define XSLT_PATTERN" > $@
        cat $< >>$@
 
 ifneq (moonlight_raw, $(PROFILE))
 BUILT_SOURCES = System.Xml.XPath/Parser.cs \
-       Mono.Xml.Xsl/PatternParser.cs \
-       Mono.Xml.Xsl/PatternTokenizer.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 \
-       Mono.Xml.Xsl/PatternParser.cs \
-       Mono.Xml.Xsl/PatternTokenizer.cs
+       Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
+       Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
 endif
 
 include ../../build/library.make

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/.gitignore b/mcs/class/System.XML/Mono.Xml.Xsl/.gitignore
index 09364e40322f47df5c8071f1e018941b9729dbc5..0e0d19d99cb865d564e94b0c35e2e1ab2ea30ad2 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Xsl/.gitignore
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/.gitignore
@@ -1,3 +1,3 @@
-/PatternParser.jay
-/PatternParser.cs
-/PatternTokenizer.cs
+/*_PatternParser.jay
+/*_PatternParser.cs
+/*_PatternTokenizer.cs