Revert 73805, 73806, 73807

[mono.git] / mcs / mcs / Makefile

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index ad5a75b7966cf8f77ab3e570347b61b3dd023ff2..6b2e653609dc3e84dc3656b8aef03c96ee0c4332 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -14,15 +14,22 @@ EXTRA_DISTFILES = \
 
 PROGRAM = $(topdir)/class/lib/$(PROFILE)/mcs.exe
 PROGRAM_COMPILE = $(BOOT_COMPILE)
-PROGRAM_INSTALL_DIR = $(prefix)/lib/mono/1.0
 
-CLEAN_FILES = y.output
+CLEAN_FILES = y.output *.exe *.mdb
 
 cs-parser.cs: cs-parser.jay $(topdir)/jay/skeleton.cs
        $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $< > jay-tmp.out && mv jay-tmp.out $@
 
 include ../build/executable.make
 
+ifeq (default, $(PROFILE))
+# Utility rule to make debugging somewhat easier.
+all-local: mcs.exe
+mcs.exe: $(PROGRAM)
+       cp -p $< $@
+       test ! -f $<.mdb || cp -p $<.mdb $@.mdb
+endif
+
 # Testing targets
 
 TIME = time
@@ -34,17 +41,17 @@ btest: mcs2.exe mcs3.exe
        ls -l mcs2.exe mcs3.exe
 
 mcs2.exe: $(PROGRAM)
-       $(TIME) $(RUNTIME) $(PROGRAM) $(USE_MCS_FLAGS) /target:exe /out:$@ $(BUILT_SOURCES) @$(response)
+       $(TIME) $(RUNTIME) $(RUNTIME_FLAGS) $(PROGRAM) $(USE_MCS_FLAGS) -target:exe -out:$@ $(BUILT_SOURCES) @$(response)
 
 mcs3.exe: mcs2.exe
-       $(TIME) $(RUNTIME) ./mcs2.exe $(USE_MCS_FLAGS) /target:exe /out:$@ $(BUILT_SOURCES) @$(response)
+       $(TIME) $(RUNTIME) $(RUNTIME_FLAGS) ./mcs2.exe $(USE_MCS_FLAGS) -target:exe -out:$@ $(BUILT_SOURCES) @$(response)
 
 wc:
        wc -l $(BUILT_SOURCES) `cat $(sourcefile)`
 
 ctest: 
        rm -f mcs2.exe mcs3.exe
-       $(MAKE) USE_MCS_FLAGS= btest
+       $(MAKE) USE_MCS_FLAGS="-d:NET_1_1 -d:ONLY_1_1" btest
 
 # we need this because bash tries to use its own crappy timer
 FRIENDLY_TIME = $(shell which time) -f'%U seconds'
@@ -66,5 +73,4 @@ do-corlib:
 PROFILER=default
 
 profile : $(PROGRAM)
-       $(RUNTIME) --profile=$(PROFILER) $(PROGRAM) $(USE_MCS_FLAGS) /target:exe /out:mcs2.exe $(BUILT_SOURCES) @$(response)
-
+       $(RUNTIME) $(RUNTIME_FLAGS) --profile=$(PROFILER) $(PROGRAM) $(USE_MCS_FLAGS) -target:exe -out:mcs2.exe $(BUILT_SOURCES) @$(response)