Avoid creating a temporary variable when target await expression is does not include...

[mono.git] / mcs / mcs / Makefile

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 8ee692f3c591e7dc985f2e4e90e97bdfbf11b751..3524c5987d9896862c09405e77e8d3fffc573826 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -3,45 +3,31 @@ SUBDIRS :=
 include ../build/rules.make
 
 EXTRA_DISTFILES = \
-       *mcs.csproj             \
+       mcs.csproj              \
        compiler.doc            \
-       *mcs.sln                \
-       *cs-parser.jay          \
-       *.sources               \
+       mcs.sln         \
+       cs-parser.jay           \
+       mcs.exe.sources         \
        NOTES                   \
        TODO                    \
-       *mcs.exe.config
-
-COMPILER_NAME = gmcs
+       ikvm.cs
 
 ifeq (basic, $(PROFILE))
-COMPILER_NAME = mcs
-LOCAL_MCS_FLAGS += -d:STATIC
-endif
-
-ifeq (net_2_0, $(PROFILE))
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
+PROGRAM = $(topdir)/class/lib/$(PROFILE)/basic.exe
+sourcefile = mcs.exe.sources
+else
+PROGRAM = $(topdir)/class/lib/build/mcs.exe
+LOCAL_MCS_FLAGS += -lib:$(topdir)/class/lib/build
 endif
 
-ifeq (moonlight_bootstrap, $(PROFILE))
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
-endif
+LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER
 
-ifeq (2.1, $(FRAMEWORK_VERSION))
-LOCAL_MCS_FLAGS += -d:SMCS_SOURCE
-COMPILER_NAME = smcs
-endif
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.0
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
-COMPILER_NAME = dmcs
-endif
-
-PROGRAM = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe
+PROGRAM_COMPILE = $(BOOT_COMPILE)
 
 BUILT_SOURCES = cs-parser.cs
 
-PROGRAM_COMPILE = $(BOOT_COMPILE)
-
 CLEAN_FILES += y.output
 
 # Use -cvt for parser debug version
@@ -55,14 +41,14 @@ include ../build/executable.make
 
 csproj-local:
        config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
-       echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
+       echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
        (echo $(is_boot); \
        echo $(BOOTSTRAP_MCS);  \
        echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
        echo $(PROGRAM); \
        echo $(BUILT_SOURCES); \
        echo $(PROGRAM); \
-       echo $(response)) > $(topdir)/../mono/msvc/scripts/inputs/$$config_file
+       echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
 
 #
 # Below this line we have local targets used for testing and development
@@ -87,10 +73,6 @@ mcs3.exe: mcs2.exe
 wc:
        wc -l $(BUILT_SOURCES) `cat $(sourcefile)`
 
-ctest: 
-       rm -f mcs2.exe mcs3.exe
-       $(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'