make some room

[mono.git] / mcs / build / rules.make

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index b6835d10b3c6319515f94cb8270c3f9bf04e01b6..b38031c0d3b82653e3f4f814b0d3c9f5545fd234 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -15,22 +15,23 @@ topdir := $(dots)
 
 VERSION = 0.93
 
-USE_MCS_FLAGS = $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
-USE_MBAS_FLAGS = $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
+USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
+USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
 USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
 CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
 BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
 CCOMPILE = $(CC) $(USE_CFLAGS)
 BOOT_COMPILE = $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
+INSTALL = $(SHELL) $(topdir)/../mono/install-sh
 INSTALL_DATA = $(INSTALL) -c -m 644
 INSTALL_BIN = $(INSTALL) -c -m 755
 INSTALL_LIB = $(INSTALL_BIN)
 MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
 INTERNAL_MCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/mcs.exe
 INTERNAL_MBAS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mbas/mbas.exe
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/gmcs/gmcs.exe
+INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/mcs/gmcs.exe
 INTERNAL_ILASM = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/ilasm.exe
-INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/tools/resgen/resgen.exe
+INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/resgen.exe
 corlib = mscorlib.dll
 
 depsdir = $(topdir)/build/deps
@@ -97,16 +98,18 @@ include $(topdir)/build/profiles/$(PROFILE).make
 ifdef OVERRIDE_TARGET_ALL
 all: all.override
 else
-all: all.real
+all: do-all
 endif
 
-all.real: all-recursive
-       $(MAKE) all-local
-
 STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
 
-$(STD_TARGETS): %: %-recursive
-       $(MAKE) $@-local
+$(STD_TARGETS): %: do-%
+
+do-run-test:
+       ok=:; $(MAKE) run-test-recursive || ok=false; $(MAKE) run-test-local || ok=false; $$ok
+
+do-%: %-recursive
+       $(MAKE) $*-local
 
 # The way this is set up, any profile-specific subdirs list should
 # be listed _before_ including rules.make.  However, the default
@@ -117,6 +120,10 @@ ifndef PROFILE_SUBDIRS
 PROFILE_SUBDIRS = $(SUBDIRS)
 endif
 
+ifndef FRAMEWORK_VERSION_MAJOR
+FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
+endif
+
 %-recursive:
        @set . $$MAKEFLAGS; final_exit=:; \
        case $$2 in --unix) shift ;; esac; \
@@ -155,6 +162,10 @@ dist-default:
            $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
        done
 
+$(depsdir)/.stamp:
+       $(MKINSTALLDIRS) $(@D)
+       touch $@
+
 # Useful
 
 withmcs: