In .:

* Makefile (DISTFILES): Add nunit.key.

In build:
* platforms/linux.make (EXTERNAL_MCS,EXTERNAL_MBAS,EXTERNAL_RUNTIME): New.
* platforms/win32.make: Likewise.
* profiles/basic.make: Use $(EXTERNAL_MCS).
* profiles/net_1_1_bootstrap.make: Likewise.
* library.make ($(the_lib)): Add support for BUILT_SOURCES.
(run-test-lib): Pass $(TEST_HARNESS_FLAGS) to harness.  Useful to
pass, say /labels, to nunit-console.

In class:
* Makefile (DISTFILES): Add public and private keys.
(lib/basic.tar.gz): New.
(dist-local): Distribute it.
(DIST_ONLY_SUBDIRS): Distribute Managed.Windows.Forms.
* I18N/Makefile (DISTFILES): Add Assembly/ChangeLog and
Assembly/AssemblyInfo.cs.
* IBM.Data.DB2/Makefile (EXTRA_DISTFILES): Distribute ibm.pub.

In class/System.Web:
* Makefile (RESOURCE_FILES): New.  List set of resources.
(EXTRA_DISTFILES): New.  Distribute them.

In class/ICSharpCode.SharpZipLib:
* Makefile (EXTRA_DISTFILES): Add SharpZipLib.pub.

In class/System.Data:
* Makefile (BUILT_SOURCES): New.  Build Mono.Data.SqlExpressions/Parser.cs.
(EXTRA_DISTFILES): Add Mono.Data.SqlExpressions/Parser.jay.
* System.Data.dll.sources: Don't mention Mono.Data.SqlExpressions/Parser.cs.

In class/Microsoft.Web.Services:
* Makefile (dist-local): Use cp -p.

In class/Npgsql:
* Makefile (EXTRA_DISTFILES): Add Npgsql.dll.resources.

In class/Mono.C5:
* Makefile (EXTRA_DISTFILES): Distribute LICENCE.txt and keys.

In class/Mono.Security.Win32:
* Makefile (NO_TEST): Define when not in W32.

In class/Microsoft.VisualBasic:
* Makefile (EXTRA_DISTFILES): Fix typo.

svn path=/trunk/mcs/; revision=36550

33 files changed, 169 insertions, 50 deletions

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index b96d429c2ff..e783b74cd64 100644
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (DISTFILES): Add nunit.key.
+
 2004-11-24  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (profiles-do--run-test): Allow list of profiles to be
diff --git a/mcs/Makefile b/mcs/Makefile
index 64f89b74127..d89e10df761 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -42,9 +42,8 @@ profiles-do--run-test:
 # Orchestrate the bootstrap here.
 profile-do--net_2_0--all: profile-do--net_2_0_bootstrap--all
 profile-do--net_2_0_bootstrap--all: profile-do--default--all
-
-ifeq (linux, $(PLATFORM))
 profile-do--default--all: profile-do--net_1_1_bootstrap--all
+ifeq (linux, $(PLATFORM))
 profile-do--net_1_1_bootstrap--all: profile-do--basic--all
 endif
 
@@ -75,7 +74,8 @@ DISTFILES = \
 	MonoIcon.png		\
 	README			\
 	ScalableMonoIcon.svg	\
-	winexe.in
+	winexe.in		\
+	nunit.key
 
 dist-local: dist-default
 
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 2c8e6ecfdd7..881432bea6d 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,5 +1,16 @@
 2004-11-25  Raja R Harinath  <rharinath@novell.com>
 
+	* platforms/linux.make (EXTERNAL_MCS,EXTERNAL_MBAS,EXTERNAL_RUNTIME):
+	New.
+	* platforms/win32.make: Likewise.
+	* profiles/basic.make: Use $(EXTERNAL_MCS).
+	* profiles/net_1_1_bootstrap.make: Likewise.
+	* library.make ($(the_lib)): Add support for BUILT_SOURCES.
+	(run-test-lib): Pass $(TEST_HARNESS_FLAGS) to harness.  Useful to
+	pass, say /labels, to nunit-console.
+
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
 	* library.make ($(gacutil)): Fix path.
 
 2004-11-23  Raja R Harinath  <rharinath@novell.com>
diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 9267087c74b..1ad575b5b26 100644
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -62,7 +62,7 @@ DISTFILES = $(sourcefile) $(base_prog_config) $(EXTRA_DISTFILES)
 dist-local: dist-default
 	for f in `cat $(sourcefile)` ; do \
 	    dest=`dirname $(distdir)/$$f` ; \
-	    $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
+	    $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
 	done
 
 ifndef PROGRAM_COMPILE
diff --git a/mcs/build/library.make b/mcs/build/library.make
index aeb6ac04c8d..b40d6875c12 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -19,7 +19,7 @@ endif
 
 ifndef response
 response = $(depsdir)/$(PROFILE)_$(LIBRARY).response
-library_CLEAN_FILES += $(response) $(LIBRARY).mdb
+library_CLEAN_FILES += $(response) $(LIBRARY).mdb $(BUILT_SOURCES)
 endif
 
 ifndef LIBRARY_NAME
@@ -162,10 +162,10 @@ run-test-local: run-test-lib
 run-test-ondotnet-local: run-test-ondotnet-lib
 
 run-test-lib: test-local
-	$(TEST_RUNTIME) $(TEST_HARNESS) /xml:TestResult-$(PROFILE).xml $(test_assemblies)
+	$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) /xml:TestResult-$(PROFILE).xml $(test_assemblies)
 
 run-test-ondotnet-lib: test-local
-	$(TEST_HARNESS) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies)
+	$(TEST_HARNESS) $(TEST_HARNESS_FLAGS) /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies)
 endif
 
 DISTFILES = $(sourcefile) $(test_sourcefile) $(EXTRA_DISTFILES)
@@ -207,19 +207,19 @@ $(gacutil):
 
 ifdef sn
 $(sn):
-	cd $(topdir)/tools/security && $(MAKE) PROFILE=net_1_1_bootstrap
+	cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
 endif
 
 # The library
 
-$(the_lib): $(response) $(sn)
+$(the_lib): $(response) $(sn) $(BUILT_SOURCES)
 ifdef LIBRARY_USE_INTERMEDIATE_FILE
-	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(@F) @$(response)
+	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(@F) $(BUILT_SOURCES) @$(response)
 	$(SN) $(SNFLAGS) $(@F) $(LIBRARY_SNK)
 	mv $(@F) $@
 	-mv $(@F).mdb $@.mdb
 else
-	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
+	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ $(BUILT_SOURCES) @$(response)
 	$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
 endif
 
diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index f0c30003e91..9c97bd2740e 100644
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -8,7 +8,9 @@ PLATFORM_MCS_FLAGS =
 PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 
-BOOTSTRAP_MCS = mcs
+EXTERNAL_MCS = mcs
+EXTERNAL_MBAS = mbas
+EXTERNAL_RUNTIME = mono
 RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
 
 PLATFORM_PATH_SEPARATOR = :
@@ -23,15 +25,7 @@ hidden_prefix = .
 hidden_suffix = 
 
 platform-check:
-	@set fnord $(BOOTSTRAP_MCS) ; while test "$$#" -gt 2; do case $$2 in *=*) shift ;; *) break ;; esac done ; \
-	if type $$2 >/dev/null 2>&1 ; then :; else \
-	    echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be available"; \
-	    echo "*** You need a C# compiler installed to build MCS. (make sure mcs works from the command line)" ; \
-	    echo "*** Read INSTALL.txt for information on how to bootstrap" ; \
-	    echo "*** a Mono installation." ; \
-	    exit 1 ; \
-	fi
-
+	@:
 # I tried this but apparently Make's version strings aren't that
 # ... consistent between releases. Whatever.
 #
diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index 1229ceef979..f596b37eb93 100644
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -8,8 +8,9 @@ PLATFORM_MCS_FLAGS = /nologo /optimize
 PLATFORM_RUNTIME = 
 PLATFORM_CORLIB = mscorlib.dll
 
-BOOTSTRAP_MCS = csc.exe
-MCS = $(BOOTSTRAP_MCS)
+EXTERNAL_MCS = csc.exe
+EXTERNAL_MBAS = vbc.exe
+EXTERNAL_RUNTIME =
 RESGEN = resgen.exe
 
 PLATFORM_MAKE_CORLIB_CMP = yes
@@ -20,3 +21,4 @@ hidden_prefix =
 hidden_suffix = .tmp
 
 platform-check:
+	@:
diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make
index f5eeec3420a..61676b94b8f 100644
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -1,5 +1,6 @@
 # -*- makefile -*-
 
+BOOTSTRAP_MCS = $(EXTERNAL_MCS)
 MCS = false
 
 PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
@@ -11,6 +12,30 @@ NO_INSTALL = yes
 profile-check:
 	@:
 
+ifeq (.,$(thisdir))
+all-recursive: real-profile-check
+endif
+
+real-profile-check:
+	-rm -f basic-profile-check.cs basic-profile-check.exe
+	@ok=:; \
+	$$ok && echo 'class X { static void Main () { System.Console.Write("OK");}}' > basic-profile-check.cs; \
+	$$ok && { $(EXTERNAL_MCS) basic-profile-check.cs || ok=false; }; \
+	$$ok && { test -f basic-profile-check.exe || ok=false; }; \
+	$$ok && { $(EXTERNAL_RUNTIME) basic-profile-check.exe > /dev/null || ok=false; }; \
+	rm -f basic-profile-check.cs basic-profile-check.exe; \
+	if $$ok; then :; else \
+	    echo "*** The compiler '$(EXTERNAL_MCS)' doesn't appear to be usable." 1>&2 ; \
+	    if test -f $(topdir)/class/lib/basic.tar.gz; then \
+	        echo "*** Falling back to using pre-compiled binaries.  Be warned, this may not work." 1>&2 ; \
+	        ( cd $(topdir)/class/lib; gzip -dc basic.tar.gz | tar xvf - ); \
+		( cd $(topdir)/jay && $(MAKE) ); ( cd $(topdir)/mcs && $(MAKE) PROFILE=basic cs-parser.cs ); \
+	        touch $(topdir)/class/lib/basic/*; \
+	    else \
+                echo "*** You need a C# compiler installed to build MCS. (make sure mcs works from the command line)" 1>&2 ; \
+                echo "*** Read INSTALL.txt for information on how to bootstrap a Mono installation." 1>&2 ; \
+	        exit 1; fi; fi
+
 install-local: no-install
 no-install:
 	exit 1
diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make
index ae9fd0c0dfb..1789c26155c 100644
--- a/mcs/build/profiles/default.make
+++ b/mcs/build/profiles/default.make
@@ -19,6 +19,7 @@ BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap:$$MONO_PATH" $(
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
 else
+BOOTSTRAP_MCS = $(EXTERNAL_MCS)
 MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
 MBAS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)
 endif
diff --git a/mcs/build/profiles/net_1_1_bootstrap.make b/mcs/build/profiles/net_1_1_bootstrap.make
index 21ab0725557..3ee93a6f847 100644
--- a/mcs/build/profiles/net_1_1_bootstrap.make
+++ b/mcs/build/profiles/net_1_1_bootstrap.make
@@ -1,8 +1,14 @@
 # -*- makefile -*-
 
+ifdef PLATFORM_MONO_NATIVE
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/basic:$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/basic/mcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
 MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
+else
+BOOTSTRAP_MCS = $(EXTERNAL_MCS)
+MCS = $(PLATFORM_RUNTIME) $(EXTERNAL_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
+MBAS = $(PLATFORM_RUNTIME) $(EXTERNAL_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)
+endif
 
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 21b38be0cd0..e6cd425b1e5 100644
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -152,7 +152,7 @@ dist-default:
 	if test -f GNUmakefile; then m=GNUm; fi; \
 	for f in $${m}akefile $(DISTFILES) ; do \
 	    dest=`dirname $(distdir)/$$f` ; \
-	    $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
+	    $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
 	done
 
 # Useful
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 809e099d051..7665c74ce86 100644
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (DISTFILES): Add public and private keys.
+	(lib/basic.tar.gz): New.
+	(dist-local): Distribute it.
+	(DIST_ONLY_SUBDIRS): Distribute Managed.Windows.Forms.
+	* I18N/Makefile (DISTFILES): Add Assembly/ChangeLog and
+	Assembly/AssemblyInfo.cs.
+	* IBM.Data.DB2/Makefile (EXTRA_DISTFILES): Distribute ibm.pub.
+
 2004-11-22  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (net_1_1_bootstrap_SUBDIRS): Add Mono.Security.
diff --git a/mcs/class/I18N/Makefile b/mcs/class/I18N/Makefile
index 71a63e55d7d..d2bdb62fae5 100644
--- a/mcs/class/I18N/Makefile
+++ b/mcs/class/I18N/Makefile
@@ -3,6 +3,8 @@ SUBDIRS = Common West MidEast Other Rare CJK
 include ../../build/rules.make
 
 DISTFILES = \
+	Assembly/ChangeLog \
+	Assembly/AssemblyInfo.cs \
 	README 		\
 	README.mono 	\
 	mklist.sh	\
diff --git a/mcs/class/IBM.Data.DB2/Makefile b/mcs/class/IBM.Data.DB2/Makefile
index a057875f370..9d78d53cf8e 100644
--- a/mcs/class/IBM.Data.DB2/Makefile
+++ b/mcs/class/IBM.Data.DB2/Makefile
@@ -7,6 +7,8 @@ LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \
 	/r:System.Xml.dll /r:System.Data.dll
 NO_TEST = yes
 
+EXTRA_DISTFILES = ibm.pub
+
 ifeq (net_2_0, $(PROFILE))
 all-local $(STD_TARGETS:=-local):
 	@:
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ChangeLog b/mcs/class/ICSharpCode.SharpZipLib/ChangeLog
index c1cb355ee2f..8e91e21a4c4 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/ChangeLog
+++ b/mcs/class/ICSharpCode.SharpZipLib/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (EXTRA_DISTFILES): Add SharpZipLib.pub.
+
 2004-06-21  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (LIBRARY_SNK): Sign with SharpZipLib.key.  The library
diff --git a/mcs/class/ICSharpCode.SharpZipLib/Makefile b/mcs/class/ICSharpCode.SharpZipLib/Makefile
index 7fc42a4fb29..fe5ae55972c 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/Makefile
+++ b/mcs/class/ICSharpCode.SharpZipLib/Makefile
@@ -7,6 +7,6 @@ LIBRARY_SNK = SharpZipLib.key
 
 LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll
 NO_TEST = yes
-EXTRA_DISTFILES = $(LIBRARY_SNK)
+EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
 
 include ../../build/library.make
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 5492635b56a..1e4a775247b 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -16,6 +16,8 @@ net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 
 include ../build/rules.make
 
+# For now, Mono.Security.Win32 is built on Linux too.
+# However, it isn't tested on Linux, since it depends on a Win32 dll.
 SUBDIRS = \
 	corlib				\
 	System				\
@@ -70,33 +72,43 @@ SUBDIRS = \
 # Linux makefile.gnu before, but they build fine, so might as well
 # include them ...
 #
-# Need a way to only build/test Mono.Security.Win32 on Windows.
-# It builds on linux, but make run-test will barf because a
-# DLL doesn't exist.
 
 # These libraries below are either unimplemented or don't compile, but
 # I wrote makefiles for them.
 
+# Managed.Windows.Forms will move to the main SUBDIRS soon.
+
 DIST_ONLY_SUBDIRS = \
 	Custommarshalers		\
-	Mono.Globalization
+	Mono.Globalization		\
+	Managed.Windows.Forms
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
 
 DISTFILES = \
+	ecma.pub		\
+	mono.pub		\
+	msfinal.pub		\
+	mono.snk		\
 	LICENSE 		\
 	README			\
 	doc/API-notes		\
 	doc/NUnitGuidelines	\
-	doc/notes		\
+	doc/TemplateTest.cs	\
 	notes/BitVecto32.txt
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
 	@:
 
-DIST_PROFILES = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
+basic_files = mcs.exe mscorlib.dll System.dll
+
+DIST_PROFILE_DIRS = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
+
+lib/basic.tar.gz: $(basic_files:%=lib/basic/%)
+	cd lib && { tar cvf - $(basic_files:%=basic/%) | gzip > basic.tar.gz; }
 
-dist-local: dist-default
-	-$(MKINSTALLDIRS) $(distdir)/lib $(DIST_PROFILES:%=$(distdir)/lib/%)
+dist-local: dist-default lib/basic.tar.gz
+	-$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%)
+	cp lib/basic.tar.gz $(distdir)/lib
diff --git a/mcs/class/Microsoft.VisualBasic/ChangeLog b/mcs/class/Microsoft.VisualBasic/ChangeLog
index 226f037b581..3f689ebd147 100644
--- a/mcs/class/Microsoft.VisualBasic/ChangeLog
+++ b/mcs/class/Microsoft.VisualBasic/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (EXTRA_DISTFILES): Fix typo.
+
 2004-11-02  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* Makefile : don't use -codepage:utf8. It breaks csc build.
diff --git a/mcs/class/Microsoft.VisualBasic/Makefile b/mcs/class/Microsoft.VisualBasic/Makefile
index 4e99ae04bd1..a2a0c015fe5 100644
--- a/mcs/class/Microsoft.VisualBasic/Makefile
+++ b/mcs/class/Microsoft.VisualBasic/Makefile
@@ -12,7 +12,7 @@ LIB_MCS_FLAGS_RESOURCES = $(LIB_MCS_FLAGS)
 TXT_RESOURCES = Microsoft.VisualBasic/VBUtils.resources
 RESX_RESOURCES = 
 
-EXTRA_DISTSFILES = $(TXT_RESOURCES:.resources=.txt) $(RESX_RESOURCES:.resources=.resx)
+EXTRA_DISTFILES = $(TXT_RESOURCES:.resources=.txt) $(RESX_RESOURCES:.resources=.resx)
 CLEAN_FILES = $(TXT_RESOURCES) $(RESX_RESOURCES)
 
 include ../../build/library.make
diff --git a/mcs/class/Microsoft.Web.Services/ChangeLog b/mcs/class/Microsoft.Web.Services/ChangeLog
index 40aacac36e7..ffd661b50f2 100644
--- a/mcs/class/Microsoft.Web.Services/ChangeLog
+++ b/mcs/class/Microsoft.Web.Services/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (dist-local): Use cp -p.
+
 2004-03-30  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* Microsoft.Web.Services.dll.2.sources: Added Mono.Xml.XmlCanonicalizer
diff --git a/mcs/class/Microsoft.Web.Services/Makefile b/mcs/class/Microsoft.Web.Services/Makefile
index 9fdb8583dbb..3eef36e9fc4 100644
--- a/mcs/class/Microsoft.Web.Services/Makefile
+++ b/mcs/class/Microsoft.Web.Services/Makefile
@@ -99,11 +99,11 @@ endif
 dist-local: dist-default
 	for f in `cat $(sourcefile)` $(TEST_FILES) ; do \
 	    dest=`dirname $(distdir)/$$f` ; \
-	    $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
+	    $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
 	done
 	for f in `cat $sourcefile2)` $(TEST_FILES) ; do \
 	    dest=`dirname $(distdir)/$$f` ; \
-	    $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1; \
+	    $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1; \
 	done
 
 # Fun with dependency tracking
diff --git a/mcs/class/Mono.C5/ChangeLog b/mcs/class/Mono.C5/ChangeLog
index 1be84c3d9d7..c068b9d26b5 100644
--- a/mcs/class/Mono.C5/ChangeLog
+++ b/mcs/class/Mono.C5/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (EXTRA_DISTFILES): Distribute LICENCE.txt and keys.
+
 2004-11-19  Martin Baulig  <martin@ximian.com>
 
 	* Wrappers.cs: Removed all the FIXME's.  GMCS can now compile the
diff --git a/mcs/class/Mono.C5/Makefile b/mcs/class/Mono.C5/Makefile
index 320be449265..a10da3c190d 100644
--- a/mcs/class/Mono.C5/Makefile
+++ b/mcs/class/Mono.C5/Makefile
@@ -7,4 +7,8 @@ LIBRARY_SNK = c5.snk
 LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
 NO_TEST = yes
 
+EXTRA_DISTFILES = \
+	LICENSE.txt \
+	c5.pub c5.snk c5.xml
+
 include ../../build/library.make
diff --git a/mcs/class/Mono.Posix/Makefile b/mcs/class/Mono.Posix/Makefile
index af66b76f98a..a036e55212f 100644
--- a/mcs/class/Mono.Posix/Makefile
+++ b/mcs/class/Mono.Posix/Makefile
@@ -8,6 +8,8 @@ NO_TEST = yes
 
 include ../../build/library.make
 
+EXTRA_DISTFILES = Mono.Unix/make-map.cs
+
 all-local: Mono.Unix/make-map.exe 
 
 Mono.Unix/make-map.exe: Mono.Unix/make-map.cs $(the_lib)
diff --git a/mcs/class/Mono.Security.Win32/ChangeLog b/mcs/class/Mono.Security.Win32/ChangeLog
index a0979dda338..2134587691f 100644
--- a/mcs/class/Mono.Security.Win32/ChangeLog
+++ b/mcs/class/Mono.Security.Win32/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (NO_TEST): Define when not in W32.
+
 2004-05-06  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* README: Updated to match the new version and public token for the 
diff --git a/mcs/class/Mono.Security.Win32/Makefile b/mcs/class/Mono.Security.Win32/Makefile
index 771bbfb45dc..db182daf3e0 100644
--- a/mcs/class/Mono.Security.Win32/Makefile
+++ b/mcs/class/Mono.Security.Win32/Makefile
@@ -6,4 +6,8 @@ LIBRARY = Mono.Security.Win32.dll
 LIB_MCS_FLAGS = /unsafe
 EXTRA_DISTFILES = README Test/ChangeLog
 
+ifneq (win32, $(PROFILE))
+NO_TEST = yes
+endif
+
 include ../../build/library.make
diff --git a/mcs/class/Npgsql/ChangeLog b/mcs/class/Npgsql/ChangeLog
index 9ca2c0f6ca1..87feec5becc 100644
--- a/mcs/class/Npgsql/ChangeLog
+++ b/mcs/class/Npgsql/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (EXTRA_DISTFILES): Add Npgsql.dll.resources.
+
 2004-11-04  Raja R Harinath  <rharinath@novell.com>
 
 	* Makefile (EXTRA_DISTFILES): Fix for 'make dist'.
diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
index b99aee92c6f..6cb0f3ee3af 100755
--- a/mcs/class/Npgsql/Makefile
+++ b/mcs/class/Npgsql/Makefile
@@ -28,7 +28,8 @@ EXTRA_DISTFILES = \
 	TODO.txt		\
 	Npgsql/Npgsql.snk	\
 	Npgsql/Npgsql.pub	\
-	$(RESX_RES:.resources=.resx)
+	$(RESX_RES:.resources=.resx) \
+	Npgsql.dll.resources
 
 include ../../build/library.make
 
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
index 317fb110eb5..8064175194b 100644
--- a/mcs/class/System.Data/ChangeLog
+++ b/mcs/class/System.Data/ChangeLog
@@ -1,10 +1,16 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (BUILT_SOURCES): New.  Build Mono.Data.SqlExpressions/Parser.cs.
+	(EXTRA_DISTFILES): Add Mono.Data.SqlExpressions/Parser.jay.
+	* System.Data.dll.sources: Don't mention Mono.Data.SqlExpressions/Parser.cs.
+
 2004-11-10  Martin Baulig  <martin@ximian.com>
 
-	 * System.Data.Sql/ISqlCommand.cs,
-	 System.Data.Sql/ISqlConnection.cs,
-	 System.Data.Sql/ISqlExecutionContext.cs,
-	 System.Data.Sql/ISqlParameterCollection.cs,
-	 System.Data.Sql/ISqlTransaction.cs: Added `new' modifiers where needed.
+	* System.Data.Sql/ISqlCommand.cs,
+	System.Data.Sql/ISqlConnection.cs,
+	System.Data.Sql/ISqlExecutionContext.cs,
+	System.Data.Sql/ISqlParameterCollection.cs,
+	System.Data.Sql/ISqlTransaction.cs: Added `new' modifiers where needed.
 
 2004-10-06  Umadevi S <sumadevi@novell.com>
 	* System.Data.dll.sources : Added ISqlNotificationReceiver, SqlNotifcationType,
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 9af5a7dbd4a..0565172617d 100644
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -29,11 +29,12 @@ EXTRA_DISTFILES = \
 	Test/System.Xml/2books.xml		\
 	Test/System.Xml/region.xml		\
 	Test/System.Xml/region.xsd		\
-	Test/System.Xml/store.xsd
+	Test/System.Xml/store.xsd		\
+	Mono.Data.SqlExpressions/Parser.jay
+
+BUILT_SOURCES = Mono.Data.SqlExpressions/Parser.cs
 
 Mono.Data.SqlExpressions/Parser.cs: Mono.Data.SqlExpressions/Parser.jay $(topdir)/jay/skeleton.cs
 	$(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
 
-CLEAN_FILES = Mono.Data.SqlExpressions/Parser.cs
-
 include ../../build/library.make
diff --git a/mcs/class/System.Data/System.Data.dll.sources b/mcs/class/System.Data/System.Data.dll.sources
index fe9cd4129e4..52cadda3f3b 100755
--- a/mcs/class/System.Data/System.Data.dll.sources
+++ b/mcs/class/System.Data/System.Data.dll.sources
@@ -328,7 +328,6 @@ System.Data.ProviderBase/DbMetaDataFactory.cs
 System.Data.ProviderBase/DbParameterBase.cs
 System.Data.ProviderBase/DbParameterCollectionBase.cs
 System.Data.ProviderBase/DbReferenceCollection.cs
-Mono.Data.SqlExpressions/Parser.cs
 Mono.Data.SqlExpressions/Tokenizer.cs
 Mono.Data.SqlExpressions/Numeric.cs
 Mono.Data.SqlExpressions/Expressions.cs
diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 5d89084caaf..df33654fbb6 100644
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+	* Makefile (RESOURCE_FILES): New.  List set of resources.
+	(EXTRA_DISTFILES): New.  Distribute them.
+
 2004-11-23  Lluis Sanchez Gual <lluis@novell.com>
 
 	* Makefile: Added TreeView resources.
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 8f701ea9bfc..ea79b88d5f5 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -2,6 +2,11 @@ thisdir = class/System.Web
 SUBDIRS = Test
 include ../../build/rules.make
 
+RESOURCE_FILES = \
+	System.Web.UI.WebControls/TreeView_Default_Collapse.gif \
+	System.Web.UI.WebControls/TreeView_Default_Expand.gif \
+	System.Web.UI.WebControls/TreeView_Default_NoExpand.gif
+
 LIBRARY = System.Web.dll
 LIB_MCS_FLAGS = \
 	/nowarn:649  	\
@@ -11,9 +16,8 @@ LIB_MCS_FLAGS = \
 	/r:System.Data.dll		\
 	/r:System.Xml.dll		\
 	/r:System.EnterpriseServices.dll \
-	/resource:System.Web.UI.WebControls/TreeView_Default_Collapse.gif \
-	/resource:System.Web.UI.WebControls/TreeView_Default_Expand.gif \
-	/resource:System.Web.UI.WebControls/TreeView_Default_NoExpand.gif
-HAS_TEST = yes
+	$(RESOURCE_FILES:%=/resource:%)
+
+EXTRA_DISTFILES = $(RESOURCE_FILES)
 
 include ../../build/library.make