Fix the shared_area logic to have it enabled by default.

[mono.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 96df495dd9d1a020e2732c451fdcef13bc08655c..26c3c193202509cca341368b899e5fba54fa58ec 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -56,7 +56,6 @@ deprecated =                                  \
 scripts_2_0 = \
        al2$(SCRIPT_SUFFIX)                     \
        gacutil2$(SCRIPT_SUFFIX)                \
-       mdoc$(SCRIPT_SUFFIX)                    \
        monop2$(SCRIPT_SUFFIX)                  \
        resgen2$(SCRIPT_SUFFIX)                 \
        wsdl2$(SCRIPT_SUFFIX)
@@ -68,6 +67,7 @@ scripts_4_0 = \
        installvst$(SCRIPT_SUFFIX)              \
        genxs$(SCRIPT_SUFFIX)                   \
        macpack$(SCRIPT_SUFFIX)                 \
+       mdoc$(SCRIPT_SUFFIX)                    \
        mono-cil-strip$(SCRIPT_SUFFIX)          \
        prj2make$(SCRIPT_SUFFIX)                \
        soapsuds$(SCRIPT_SUFFIX)                \
@@ -97,7 +97,9 @@ scripts_4_0 = \
        sqlsharp$(SCRIPT_SUFFIX)                \
        svcutil$(SCRIPT_SUFFIX)                 \
        xbuild$(SCRIPT_SUFFIX)                  \
-       ccrewrite$(SCRIPT_SUFFIX)
+       ccrewrite$(SCRIPT_SUFFIX)               \
+       cccheck$(SCRIPT_SUFFIX)                 \
+       mdbrebase$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
        mdoc-assemble \
@@ -130,11 +132,11 @@ scripts_defaults =                \
        wsdl$(SCRIPT_SUFFIX)
 
 scripts_service = mono-service mono-service2
-scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX)
+scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX) nunit-console4$(SCRIPT_SUFFIX)
 scripts_rpmhelpers = mono-find-provides mono-find-requires
 scripts_mono_configuration_crypto = mono-configuration-crypto$(SCRIPT_SUFFIX)
 
-CLEANFILES = $(scripts_mono_configuration_crypto) $(scripts_4_0_umask) $(scripts_2_0) $(scripts_defaults) $(scripts_4_0) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires mod $(MDOC_SUBCOMMANDS)
+CLEANFILES = $(scripts_mono_configuration_crypto) $(scripts_4_0_umask) $(scripts_2_0) $(scripts_defaults) $(scripts_4_0) mono-service mono-service2 nunit-console nunit-console2 nunit-console4 mono-find-provides mono-find-requires mod $(MDOC_SUBCOMMANDS)
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
 EXTRA_DIST =                   \
@@ -147,13 +149,13 @@ EXTRA_DIST =                      \
        mono-find-provides.in   \
        mono-find-requires.in   \
        peverify.in                     \
+       update_submodules               \
        mcs.in                          \
        gmcs.in                         \
        dmcs.in                         \
        mono-test-install       \
        mono-heapviz            \
        $(MDOC_COMPAT)          \
-       patch-quiet.sh          \
        get-cygwin-deps.sh      \
        mono-configuration-crypto.in
 
@@ -189,11 +191,16 @@ REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g
 REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
 if INSTALL_4_0
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
+REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
 else
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 endif
 REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
+if INSTALL_4_0
+REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.5,g'
+else
+REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
+endif
 
 peverify: peverify.in Makefile
        $(REWRITE_COMMON) $(srcdir)/peverify.in > $@.tmp
@@ -227,6 +234,10 @@ nunit-console2$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
        $(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
+nunit-console4$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
+       $(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+       mv -f $@.tmp $@
+
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
        $(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp