more test

[mono.git] / mcs / build / library.make

diff --git a/mcs/build/library.make b/mcs/build/library.make
index e09c142966824a26f19c477c7b1165e1b714272f..87f5e3d2cbd7c91b2c2087ae635c2d029f435fc3 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -8,9 +8,7 @@
 # All the dep files now land in the same directory so we
 # munge in the library name to keep the files from clashing.
 
-ifndef sourcefile
 sourcefile = $(LIBRARY).sources
-endif
 
 # If the directory contains the per profile include file, generate list file.
 PROFILE_sources = $(PROFILE)_$(LIBRARY).sources
@@ -92,13 +90,6 @@ endif
 
 endif
 
-ifdef NO_INSTALL
-GACUTIL = :
-else
-gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
-endif
-
 ifdef NO_SIGN_ASSEMBLY
 SN = :
 else
@@ -199,6 +190,7 @@ test_assemblies += $(btest_lib)
 endif
 
 ifdef test_assemblies
+check: run-test
 test-local: $(test_assemblies)
 run-test-local: run-test-lib
 run-test-ondotnet-local: run-test-ondotnet-lib
@@ -230,7 +222,7 @@ run-test-ondotnet-lib: test-local
        $(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok
 endif
 
-DISTFILES = $(sourcefile) $(EXTRA_DISTFILES)
+DISTFILES = $(wildcard *$(LIBRARY)*.sources) $(EXTRA_DISTFILES)
 
 TEST_FILES =
 
@@ -243,9 +235,10 @@ TEST_FILES += `sed -e '/^$$/d' -e 's,^,Test/,' $(btest_sourcefile)`
 DISTFILES += $(btest_sourcefile)
 endif
 
+# make dist will collect files in .sources files from all profiles
 dist-local: dist-default
        subs=' ' ; \
-       for f in `cat $(sourcefile)` $(TEST_FILES) ; do \
+       for f in `$(topdir)/tools/removecomments.sh $(wildcard *$(LIBRARY).sources)` $(TEST_FILES) ; do \
          case $$f in \
          ../*) : ;; \
          *) dest=`dirname $$f` ; \
@@ -298,10 +291,6 @@ endif
 
 # The library
 
-$(the_libdir)/.stamp $(build_libdir:=/.stamp):
-       $(MKINSTALLDIRS) $(@D)
-       touch $@
-
 $(the_lib): $(the_libdir)/.stamp
 
 $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
@@ -365,6 +354,9 @@ $(btest_makefrag): $(btest_response)
 
 endif
 
+## Include corcompare stuff
+include $(topdir)/build/corcompare.make
+
 all-local: $(makefrag) $(test_makefrag) $(btest_makefrag)
 ifneq ($(response),$(sourcefile))
 $(response): $(topdir)/build/library.make $(depsdir)/.stamp