**** Merged r37868 from MCS ****

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c519486c3237a8111b0da44f5dd55323bf7a960e..d36ec4cee9ca3bb3c48146f7389813f06fe71fb6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono support docs data runtime scripts man samples web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web 
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono docs data runtime scripts man samples support web tools
+DIST_SUBDIRS = libgc mono docs data runtime scripts man samples ikvm-native support web tools
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
@@ -53,14 +53,12 @@ win32getdeps:
        wget http://www.go-mono.com/archive/libiconv-1.7.zip 
        wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip 
        wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
-       wget http://www.jroith.de/nsis4cygwin.zip
        unzip -n -d / pkgconfig-0.11-20020310.zip
        unzip -n -d / glib-2.0.4-20020703.zip
        unzip -n -d / glib-dev-2.0.4-20020703.zip
        unzip -n -d / libiconv-1.7.zip
        unzip -n -d / libiconv-dev-1.7.zip
        unzip -n -d / libintl-0.10.40-20020101.zip
-       unzip -n -d / nsis4cygwin.zip
 
 win32setup:
        makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi