Importing libatomic_ops 1.0

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c92343af8a5e45f39ef77190facbbf7a77c54f35..2e992141553dc6a8d291fc04cbf88e0d67491b73 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,9 @@ SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts
 ## 'tools' is not normally built
 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:
@@ -20,7 +22,8 @@ pkgconfig_DATA= mono.pc mint.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