X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=19f0cfbd7990508265351ab1424b1c6b397106a3;hb=6013224ecf43d5638bde61afefe9485119f3037e;hp=8d2b691fa7bc0e2c4cd2a521b70044b18dd0a936;hpb=2b19bdc99c0a18b514eddfdeb4a6d2ad8d8b0a18;p=mono.git diff --git a/Makefile.am b/Makefile.am index 8d2b691fa7b..19f0cfbd799 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,19 +10,11 @@ SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scr ## 'tools' is not normally built 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 -else -if ONLY_XAMMAC -SUBDIRS = $(libgc_dir) eglib/src mono runtime -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_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs endif -endif -endif all: update_submodules @@ -36,11 +28,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 @@ -52,7 +42,7 @@ dist-hook: d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive rm -rf `find $(top_distdir)/external -path '*\.git'` rm -f `find $(top_distdir)/external -path '*\.exe'` - rm -f `find $(top_distdir)/external -path '*\.dll'` + 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: