X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=49c871120a66d605c05d05363f565f33c304dfb8;hb=99cd48aac1c2797aeedf3bebeadbf937f9640e38;hp=e8912dfb50edac5f254d0d3d2f0072e744313c22;hpb=38392a71e499d14a9a1ce05b782ac5f1c098ce8c;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index e8912dfb50e..49c871120a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,15 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web monod
+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 ikvm-native support docs data runtime scripts man samples web tools monod
+DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools 
 
-EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
+vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
+
+EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in $(vs_files)
 
 # Distribute the 'mcs' tree too
 dist-hook:
@@ -16,11 +18,12 @@ dist-hook:
 
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc
+pkgconfig_DATA= mono.pc mint.pc dotnet.pc
 else
 pkgconfig_DATA= mint.pc
 endif
-DISTCLEANFILES= mono.pc mint.pc
+noinst_DATA = mono-uninstalled.pc
+DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 
@@ -38,9 +41,18 @@ compiler-tests: mcs-do-clean
 	$(MAKE) all
 	$(MAKE) mcs-do-compiler-tests
 
+compiler-tests-net_2_0:
+	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0_bootstrap clean
+	cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
+	$(MAKE) all
+	$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
+
 bootstrap-world: compiler-tests
 	$(MAKE) install
 
+bootstrap-world-net_2_0: compiler-tests-net_2_0
+	$(MAKE) install
+
 # internal targets
 mcs-do-clean:
 	cd runtime && $(MAKE) clean-local