[msvc] Update csproj files (#4645)

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1dbe3b14a2ecd964a9bf9f6ce48492b3eed09520..ede769564985d5b87cdf226a5ee99e9783381c44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,10 +44,6 @@ dist-hook:
        rm -rf `find $(top_distdir)/external -path '*\.git'`
        rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
        rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
-       cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
-       cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
-# Disable this for now because it is very slow and causes wrench to timeout:
-#      test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
 
 pkgconfigdir = $(libdir)/pkgconfig
 noinst_DATA = mono-uninstalled.pc
@@ -55,16 +51,13 @@ DISTCLEANFILES= mono-uninstalled.pc
 
 # building with monolite
 mcslib = $(mcs_topdir)/class/lib
-monolite = $(mcslib)/monolite
 monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
 .PHONY: get-monolite-latest 
 get-monolite-latest:
-       -rm -fr $(mcslib)/monolite-*
-       -mkdir -p $(mcslib)
-       test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
-       test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
+       -rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
+       -mkdir -p $(mcslib)/monolite
        cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
-       cd $(mcslib) && mv -f monolite-* monolite
+       cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
 
 if BITCODE
 BITCODE_CHECK=yes