X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=blobdiff_plain;f=Makefile.am;h=12b27f14b08425ea15bae3ce0d3af13287c02368;hp=ede769564985d5b87cdf226a5ee99e9783381c44;hb=HEAD;hpb=0568203e32b2ce7a746b1e73f55610b6488f761c

diff --git a/Makefile.am b/Makefile.am
index ede76956498..12b27f14b08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CFLAGS = $(WERROR_CFLAGS)
 
-MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
+MONOTOUCH_SUBDIRS = $(libgc_dir) mono
 
 # Some tools might not build when cross-compiling
 if CROSS_COMPILING
@@ -11,9 +11,9 @@ else
 tools_dir = tools
 endif
 
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
+SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
 # Keep in sync with SUBDIRS
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
+DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
 
 all: update_submodules
 
@@ -50,14 +50,9 @@ noinst_DATA = mono-uninstalled.pc
 DISTCLEANFILES= mono-uninstalled.pc
 
 # building with monolite
-mcslib = $(mcs_topdir)/class/lib
-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/$(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/$(MONO_CORLIB_VERSION)
+	$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
 
 if BITCODE
 BITCODE_CHECK=yes
@@ -114,23 +109,6 @@ monotouch-do-clean:
 
 endif
 
-win32getdeps:
-	wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
-	wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip 
-	wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip 
-	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
-	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
-
-win32setup:
-	makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
-
 update-csproj:
 	-rm msvc/scripts/order 
 	-rm msvc/scripts/order.xml
@@ -167,4 +145,7 @@ update-llvm-version:
 update-solution-files:
 	make update-csproj
 	make package-inputs
-	(cd msvc/scripts; make genproj.exe; mono genproj.exe)
+	(cd msvc/scripts; make genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
+
+update-solution-files-with-tests:
+	make "GENPROJ_ARGS=2012 true true" update-solution-files