Also update this

[mono.git] / mcs / gmcs / Makefile

diff --git a/mcs/gmcs/Makefile b/mcs/gmcs/Makefile
index 00728fa9f39125037fe20fb22a6a4168ab0e9d23..5913707e632c17a7578bb3c09426797506aa23da 100644 (file)
--- a/mcs/gmcs/Makefile
+++ b/mcs/gmcs/Makefile
@@ -22,7 +22,6 @@ COMPILER_SOURCES = \
        expression.cs                   \
        flowanalysis.cs                 \
        generic.cs                      \
-       interface.cs                    \
        iterators.cs                    \
        literal.cs                      \
        location.cs                     \
@@ -36,14 +35,14 @@ COMPILER_SOURCES = \
        support.cs                      \
        typemanager.cs                  \
        symbolwriter.cs                 \
-       tree.cs
+       tree.cs                         \
+       CryptoConvert.cs
 
 all_sources = $(COMPILER_SOURCES) cs-parser.cs
 
 DISTFILES = \
        $(COMPILER_SOURCES)     \
        compiler.csproj         \
-       compiler.csproj.user    \
        compiler.doc            \
        compiler.sln            \
        cs-parser.jay           \
@@ -54,8 +53,8 @@ DISTFILES = \
 all-local: gmcs.exe
 
 install-local: gmcs.exe
-       $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
-       $(INSTALL_BIN) gmcs.exe $(DESTDIR)$(prefix)/bin
+       $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib/mono/2.0
+       $(INSTALL_BIN) gmcs.exe $(DESTDIR)$(prefix)/lib/mono/2.0
 
 uninstall-local:
        -rm -f $(DESTDIR)$(prefix)/bin/mcs.exe
@@ -68,7 +67,7 @@ clean-local:
 dist-local: dist-default
 
 gmcs.exe: $(all_sources)
-       $(BOOT_COMPILE) /target:exe /out:$@ $^
+       MONO_PATH="../class/lib/net_2_0_bootstrap:$(MONO_PATH)" $(BOOT_COMPILE) /target:exe /out:$@ $^
 
 cs-parser.cs: cs-parser.jay $(topdir)/jay/skeleton.cs
        $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $< >$@
@@ -101,7 +100,7 @@ FRIENDLY_TIME = $(shell which time) -f'%U seconds'
 
 do-time : mcs.exe
        @ echo -n "Run 1:   "
-       @ $(FRIENDLY_TIME) $(RUNTIME) ./mcs.exe $(USE_MCS_FLAGS) /target:exe /out:mcs2.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
+        $(FRIENDLY_TIME) $(RUNTIME) ./mcs.exe $(USE_MCS_FLAGS) /target:exe /out:mcs2.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
        @ echo -n "Run 2:   "
        @ $(FRIENDLY_TIME) $(RUNTIME) ./mcs2.exe $(USE_MCS_FLAGS) /target:exe /out:mcs3.exe $(all_sources) > /dev/null || (echo FAILED; exit 1)
        @ echo -n "corlib:  "