From: Raja R Harinath <harinath@hurrynot.org>
Date: Fri, 19 Nov 2004 13:35:38 +0000 (-0000)
Subject: 2004-11-19  Raja R Harinath  <rharinath@novell.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=c52abd8761a9056732df27df90313927de4b20fe;p=mono.git

2004-11-19  Raja R Harinath  <rharinath@novell.com>
	* Makefile.am (check-local): New.  Integrate into 'make check'.
	(MCS,RUNTIME): Define using in-tree mono and mcs.
	(ILASM): New.
	(%.exe): Use $(ILASM).


svn path=/trunk/mono/; revision=36314
---

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index ed9bc3f4ec2..37a00cc0afc 100644
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-19  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile.am (check-local): New.  Integrate into 'make check'.
+	(MCS,RUNTIME): Define using in-tree mono and mcs.
+	(ILASM): New.
+	(%.exe): Use $(ILASM).
 
 Fri Nov 19 14:54:07 CET 2004 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 5d99c8df007..8a2950bb8c7 100644
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -31,8 +31,9 @@ static_libs=	\
 	$(libgc_static_libs) \
 	$(ICU_LIBS)
 
-MCS=mcs
-RUNTIME=mono
+RUNTIME = $(LIBTOOL) --mode=execute ./mono
+MCS = MONO_PATH=$(top_srcdir)/runtime/net_1_1 $(RUNTIME) --config $(top_builddir)/data/config $(top_srcdir)/runtime/mcs.exe --unsafe -nowarn:0162
+ILASM = MONO_PATH=$(top_srcdir)/runtime/net_1_1 $(RUNTIME) --config ../../data/config $(top_srcdir)/runtime/ilasm.exe
 
 INCLUDES = \
 	-I$(top_srcdir) 	\
@@ -257,7 +258,7 @@ libmono_la_LIBADD = \
 	$(MCS) /out:$*.exe /unsafe $< /r:TestDriver.dll
 
 %.exe: %.il
-	ilasm /output=$*.exe $<
+	$(ILASM) /output=$*.exe $<
 
 TestDriver.dll: $(srcdir)/TestDriver.cs
 	$(MCS) /out:TestDriver.dll /target:library $(srcdir)/TestDriver.cs
@@ -319,6 +320,8 @@ stat3: mono bench.exe
 docu: mini.sgm
 	docbook2txt mini.sgm
 
+check-local: rcheck
+
 clean-local:
 	rm -f mono a.out gmon.out *.o test.exe