X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2FMakefile;h=2a0b1b0c75ba99031f3b57d1f7f94881bf12cc52;hb=3bc6741c3037000eebd46b91efad54e5e6915c74;hp=43a2780851e2951341f0ad3643d120cb53c7de59;hpb=b3f3ef56c81f6589870659ca6b7db13143ea4d87;p=mono.git

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 43a2780851e..2a0b1b0c75b 100644
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -3,44 +3,36 @@ 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
-
-ifeq (net_2_0, $(PROFILE))
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
+	ikvm.cs
+
+ifeq (basic, $(PROFILE))
+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
 
-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
 %-parser.cs: %-parser.jay $(topdir)/jay/skeleton.cs
-	$(topdir)/jay/jay -cvt < $(topdir)/jay/skeleton.cs $< > jay-tmp.out && mv jay-tmp.out $@
+	$(topdir)/jay/jay -cv < $(topdir)/jay/skeleton.cs $< > jay-tmp.out && mv jay-tmp.out $@
 
 
 KEEP_OUTPUT_FILE_COPY = yes
@@ -49,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