Browse Source

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

Otherwise parallel builds will break randomly.
Rolf Bjarne Kvinge 11 years ago
parent
commit
a9b8a73f68
2 changed files with 5 additions and 5 deletions
  1. 4 4
      mcs/class/System.XML/Makefile
  2. 1 1
      mcs/class/System.XML/System.Xml.XPath/.gitignore

+ 4 - 4
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

+ 1 - 1
mcs/class/System.XML/System.Xml.XPath/.gitignore

@@ -1 +1 @@
-/Parser.cs
+/*_Parser.cs