Merge pull request #2566 from lambdageek/monoerror-mono_module_get_object

[mono.git] / mcs / class / Mono.Xml.Ext / Makefile

diff --git a/mcs/class/Mono.Xml.Ext/Makefile b/mcs/class/Mono.Xml.Ext/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 20b70c8..32b46e6
--- a/mcs/class/Mono.Xml.Ext/Makefile
+++ b/mcs/class/Mono.Xml.Ext/Makefile
@@ -3,15 +3,15 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = Mono.Xml.Ext.dll
-LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 ifeq ($(PROFILE),atomic)
 SCARY_LIB=
 else
-SCARY_LIB=/lib:$(prefix)/lib /noconfig
+SCARY_LIB=/lib:$(prefix)/lib
 endif
 
-LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib) /r:System.dll /r:System.Xml.dll
+LIB_REFS = System System.Xml
+LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe /r:$(corlib)
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = \
@@ -28,13 +28,13 @@ Mono.Xml.XPath2/XQueryParser.jay: Mono.Xml.XPath2/ParserBase.jay $(SKELETON)
 Mono.Xml.XPath2/XPath2Parser.cs: Mono.Xml.XPath2/XPath2Parser.jay
        echo "#define XPATH2_PARSER" > $@
        echo "#if NET_2_0" >> $@
-       $(topdir)/jay/jay -ct < $(SKELETON) $< >>$@
+       $(topdir)/jay/jay -ct < $(SKELETON) $(CURDIR)/$< >>$@
        echo "#endif" >> $@
 
 Mono.Xml.XPath2/XQueryParser.cs: Mono.Xml.XPath2/XQueryParser.jay $(SKELETON)
        echo "#define XQUERY_PARSER" > $@
        echo "#if NET_2_0" >> $@
-       $(topdir)/jay/jay -ct < $(SKELETON) $< >>$@
+       $(topdir)/jay/jay -ct < $(SKELETON) $(CURDIR)/$< >>$@
        echo "#endif" >> $@
 
 Mono.Xml.XPath2/XPath2Tokenizer.cs: Mono.Xml.XPath2/TokenizerBase.cs