* SettingsPropertyValue.cs: fixed binary deserealization that may be present as base6...

[mono.git] / runtime / Makefile.am

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index c807bf32b01de78955c05ce7223dcb9ec6ef32ec..8a2fd6550883dc4a3baf0bf6500fbd7812aacc4e 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,23 +6,16 @@ tmpinst = _tmpinst
 noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper
 
 etctmp = etc
-symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config
+symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config 
 
 etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
+etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
 
 $(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
-SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config
-
-# The write check is to foil 'make distcheck'
-all-local: $(SUPPORT_FILES)
-       if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
-       d=`pwd`; ok=:; \
-       ( cd $(mcs_topdir) && \
-         $(MAKE) PROFILES='$(build_profiles)' all-profiles ) || ok=false; \
-       ./semdel-wrapper || :; $$ok
+SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if INSTALL_2_0
 build_profiles = default net_2_0
@@ -30,15 +23,19 @@ else
 build_profiles = default
 endif
 
+if BUILD_MCS
+
+# The write check is to foil 'make distcheck'
+all-local: $(SUPPORT_FILES)
+       if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+
 # override automake
 install: install-exec install-data
 
 # override automake
 install-exec: $(SUPPORT_FILES)
-       d=`pwd`; ok=:; \
-       ( cd $(mcs_topdir) && \
-         $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles ) || ok=false; \
-       ./semdel-wrapper || :; $$ok
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
 
 # override automake
 install-data:
@@ -46,17 +43,16 @@ install-data:
 
 # override automake
 uninstall:
-       d=`pwd`; ok=:; \
-       ( cd $(mcs_topdir) && \
-         $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ) || ok=false; \
-       ./semdel-wrapper || :; $$ok
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
 
 ## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
 clean-local:
-       d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
        -./semdel-wrapper
        -rm -fr $(etctmp) $(tmpinst) .wapi
 
+endif BUILD_MCS
+
 if INSTALL_2_0
 TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
 else
@@ -71,14 +67,11 @@ test_select = ONLY_CENTUM_TESTS=yes
 endif
 
 mcs-do-test-profiles:
-       d=`pwd`; ok=:; \
-       ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles ) || ok=false; \
-       ./semdel-wrapper || :; $$ok
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
-       d=`pwd`; ok=:; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \
-       ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ok=false; \
-       ./semdel-wrapper || :; rm -fr $(tmpinst); $$ok
+       d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
 
 if PLATFORM_WIN32
 cur_dir_cmd = cygpath -w -a .
@@ -89,33 +82,33 @@ PLATFORM_PATH_SEPARATOR = :
 endif
 
 # Use --compile-all as a poor man's PEVerify to detect invalid IL
-mcs-compileall: mono-wrapper wrapper-config
+mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(build_profiles); do \
          MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \
-         for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe $(mcs_topdir)/class/Microsoft.VisualBasic/fixup/$$profile/*.dll; do \
+         for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do \
            if ./mono-wrapper --compile-all $$i; then \
              echo $$i verified OK; \
            else \
              echo $$i verification failed; ok=false; \
            fi; done; done; \
-       ./semdel-wrapper || :; $$ok
+       $$ok
 
 check-local: mcs-compileall mcs-do-test-profiles
        $(MAKE) $(test_select) mcs-do-run-test-profiles
 
-CLEANFILES = wrapper-config
+CLEANFILES = etc/mono/config
 
-wrapper-config: ../data/config Makefile
+# depend on $(symlinks) to ensure 'etc/mono' directory exists
+etc/mono/config: ../data/config Makefile $(symlinks)
        d=`cd ../support && pwd`; \
-       sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@
+       sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t
        if test -z "$(libgdiplus_loc)"; then :; else \
-         mv $@ $@t; \
-         sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@; \
-         rm -f $@t; \
-       fi
+         sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@tt; \
+         mv -f $@tt $@t; fi
+       mv -f $@t $@
 
-$(tmpinst)/bin/mono: mono-wrapper wrapper-config
+$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
        cp mono-wrapper $@
 
 $(tmpinst)/bin/mcs: