Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7d2251fd6405bcef8e7dfd26848bf2066df97d21..68269d7e9175ba4c3ac2f06864f3c3b247b6f836 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ if CROSS_COMPILING
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 else
 if ONLY_MONOTOUCH
 SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
@@ -19,7 +19,7 @@ else
 SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
 endif
 endif
 endif
@@ -36,11 +36,9 @@ EXTRA_DIST= \
         README.md \
            LICENSE \
            autogen.sh \
-           build-mingw32.sh \
            mkinstalldirs \
            mono-uninstalled.pc.in \
            winconfig.h \
-           mono-core.spec \
            external
 
 DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
@@ -50,7 +48,9 @@ GIT_DIR ?= $(srcdir)/.git
 dist-hook:
        test -d $(distdir)/mcs || mkdir $(distdir)/mcs
        d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
-       rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
+       rm -rf `find $(top_distdir)/external -path '*\.git'`
+       rm -f `find $(top_distdir)/external -path '*\.exe'`
+       rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
        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: