2002-08-13 Piers Haken <piersh@friskit.com>

	* class/library.make: merge back original makefile.gnu behavior
	* */makefile.gnu: merge back original makefile.gnu behavior

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

12 files changed, 51 insertions, 19 deletions

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index 33fd064d308..a1491fb65f1 100644
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-13  Piers Haken <piersh@friskit.com>
+
+	* class/library.make: merge back original makefile.gnu behavior
+	* */makefile.gnu: merge back original makefile.gnu behavior
+
 2002-08-12  Piers Haken <piersh@friskit.com>
 
 	* class/library.make: use 'find' to specify source files, instead of static files
diff --git a/mcs/class/System.Configuration.Install/makefile.gnu b/mcs/class/System.Configuration.Install/makefile.gnu
index 659f8d1a763..5400fd35001 100644
--- a/mcs/class/System.Configuration.Install/makefile.gnu
+++ b/mcs/class/System.Configuration.Install/makefile.gnu
@@ -2,11 +2,11 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Configuration.Install.dll
 
+LIB_LIST = list.unix
 LIB_FLAGS = -r corlib 
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
+SOURCES_EXCLUDE=./Test*
 
 export MONO_PATH_PREFIX = ../lib:
 
diff --git a/mcs/class/System.Data/makefile.gnu b/mcs/class/System.Data/makefile.gnu
index 48d10a07866..7e547e0e5a4 100644
--- a/mcs/class/System.Data/makefile.gnu
+++ b/mcs/class/System.Data/makefile.gnu
@@ -2,6 +2,7 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Data.dll
 
+LIB_LIST = list
 LIB_FLAGS = -r corlib -r System -r System.Xml
 
 SOURCES_INCLUDE=*.cs
diff --git a/mcs/class/System.Drawing/makefile.gnu b/mcs/class/System.Drawing/makefile.gnu
index 4f201a9d41d..2df515a9802 100644
--- a/mcs/class/System.Drawing/makefile.gnu
+++ b/mcs/class/System.Drawing/makefile.gnu
@@ -2,11 +2,11 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Drawing.dll
 
+LIB_LIST = list.unix
 LIB_FLAGS = -r corlib -r System
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
+SOURCES_EXCLUDE=./Test*
 
 export MONO_PATH_PREFIX = ../lib:
 
diff --git a/mcs/class/System.EnterpriseServices/makefile.gnu b/mcs/class/System.EnterpriseServices/makefile.gnu
index ff1386aa2da..8a87d3baa00 100644
--- a/mcs/class/System.EnterpriseServices/makefile.gnu
+++ b/mcs/class/System.EnterpriseServices/makefile.gnu
@@ -2,11 +2,11 @@ topdir = ../..
 
 LIBRARY = ../lib/System.EnterpriseServices.dll
 
+LIB_LIST = list
 LIB_FLAGS = -r corlib 
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
+SOURCES_EXCLUDE=./Test*
 
 export MONO_PATH_PREFIX = ../lib:
 
diff --git a/mcs/class/System.Web.Services/makefile.gnu b/mcs/class/System.Web.Services/makefile.gnu
index 0dc6cce9ce6..73481074326 100644
--- a/mcs/class/System.Web.Services/makefile.gnu
+++ b/mcs/class/System.Web.Services/makefile.gnu
@@ -2,11 +2,11 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Web.Services.dll
 
+LIB_LIST = list
 LIB_FLAGS = -r corlib -r System.Xml -r System.EnterpriseServices -r System.Web -r System
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
+SOURCES_EXCLUDE=./Test*
 
 export MONO_PATH_PREFIX = ../lib:
 
diff --git a/mcs/class/System.Web/makefile.gnu b/mcs/class/System.Web/makefile.gnu
index 23873076764..53781b6ffe4 100644
--- a/mcs/class/System.Web/makefile.gnu
+++ b/mcs/class/System.Web/makefile.gnu
@@ -2,12 +2,11 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Web.dll
 
+LIB_LIST = list
 LIB_FLAGS = -r corlib -r System -r System.Drawing -r System.Xml
 
 SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=\
-	./Test*
-
+SOURCES_EXCLUDE=./Test*
 
 export MONO_PATH_PREFIX = ../lib:
 
diff --git a/mcs/class/System.XML/makefile.gnu b/mcs/class/System.XML/makefile.gnu
index 85b2562ef3f..87bd748e327 100644
--- a/mcs/class/System.XML/makefile.gnu
+++ b/mcs/class/System.XML/makefile.gnu
@@ -2,6 +2,7 @@ topdir = ../..
 
 LIBRARY = ../lib/System.Xml.dll
 
+LIB_LIST = list.unix
 LIB_FLAGS = -r corlib -r System
 
 SOURCES_INCLUDE=*.cs
@@ -9,7 +10,6 @@ SOURCES_EXCLUDE=\
 	./Test*	\
 	./System.Xml/Driver.cs
 
-
 export MONO_PATH_PREFIX = ../lib:
 
 include ../library.make
diff --git a/mcs/class/System/makefile.gnu b/mcs/class/System/makefile.gnu
index dfbc23c9b76..f1bb109f4f1 100644
--- a/mcs/class/System/makefile.gnu
+++ b/mcs/class/System/makefile.gnu
@@ -2,8 +2,8 @@ topdir = ../..
 
 LIBRARY = ../lib/System.dll
 
-LIB_FLAGS = -r corlib -r System.Xml -r mscorlib -r System.Xml
-#-r System.Drawing
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r System.Xml -r mscorlib
 
 SOURCES_INCLUDE=*.cs
 SOURCES_EXCLUDE=\
@@ -15,6 +15,7 @@ SOURCES_EXCLUDE=\
 	./System.Diagnostics/Counter*.cs	\
 	./System.Diagnostics/InstanceData*.cs
 
+
 export MONO_PATH_PREFIX = ../lib:
 
 include ../library.make
diff --git a/mcs/class/corlib/makefile.gnu b/mcs/class/corlib/makefile.gnu
index c3b82f94911..c38eade6d42 100644
--- a/mcs/class/corlib/makefile.gnu
+++ b/mcs/class/corlib/makefile.gnu
@@ -2,6 +2,7 @@ topdir = ../..
 
 LIBRARY = ../lib/corlib.dll
 
+LIB_LIST = unix.args
 LIB_FLAGS = --unsafe --nostdlib
 
 SOURCES_INCLUDE=*.cs
diff --git a/mcs/class/library.make b/mcs/class/library.make
index 2818cb67de6..f1b4af4e6ef 100644
--- a/mcs/class/library.make
+++ b/mcs/class/library.make
@@ -1,25 +1,50 @@
+#USE_SOURCE_RULES=1
 MCS = mono $(topdir)/mcs/mcs.exe
 MCS_FLAGS = --target library --noconfig
 INSTALL = /usr/bin/install
 prefix = /usr
 
+
 SOURCES_CMD=find . \
-	  \( -false $(SOURCES_INCLUDE:%=-o -path '%') \) -a	 \
-	! \( -false $(SOURCES_EXCLUDE:%=-o -path '%') \)
+	! \( $(SOURCES_INCLUDE:%=! -path '%' ) \) -a	\
+	  \( $(SOURCES_EXCLUDE:%=! -path '%' ) \) -a	\
+	  ! -path '*/__*.cs'
+
 
 all: .makefrag $(LIBRARY)
 
 clean:
-	-rm -rf $(LIBRARY) .response .makefrag
+	-rm -rf $(LIBRARY) .response .makefrag library-deps.stamp
+
+
+ifdef USE_SOURCE_RULES
 
 .PHONY: .makefrag
 .makefrag:
 	@echo -n "SOURCES=" >$@
 	@$(SOURCES_CMD) | tee .response | sed -e 's/$$/ \\/' >>$@
 
+else
+
+.response: $(LIB_LIST)
+	cat $^ |egrep '\.cs$$' >$@
+
+.makefrag: $(LIB_LIST) $(topdir)/class/library.make
+	echo -n "library-deps.stamp: " >$@.new
+	cat $< |egrep '\.cs$$' | sed -e 's,\.cs,.cs \\,' >>$@.new
+	cat $@.new |sed -e '$$s, \\$$,,' >$@
+	echo -e "\ttouch library-deps.stamp" >>$@
+	rm -rf $@.new
+
+endif
+
 -include .makefrag
 
+ifdef USE_SOURCE_RULES
 $(LIBRARY): $(SOURCES) $(topdir)/class/library.make
+else
+$(LIBRARY): .response library-deps.stamp
+endif
 	MONO_PATH=$(MONO_PATH_PREFIX)$(MONO_PATH) $(MCS) $(MCS_FLAGS) -o $(LIBRARY) $(LIB_FLAGS) @.response
 
 install: all
diff --git a/mcs/nunit/makefile.gnu b/mcs/nunit/makefile.gnu
index c4a8a4f21fc..e3683ab655f 100644
--- a/mcs/nunit/makefile.gnu
+++ b/mcs/nunit/makefile.gnu
@@ -2,11 +2,11 @@ topdir = ..
 
 LIBRARY = ../class/lib/NUnitCore_mono.dll
 
-#LIB_LIST = list.unix
+LIB_LIST = list.unix
 LIB_FLAGS = -r ../class/lib/corlib.dll -r ../class/lib/System.dll
 
 SOURCES_INCLUDE=./src/NUnitCore/*.cs
-SOURCES_EXCLUDE=
+SOURCES_EXCLUDE=/dev/null
 
 export MONO_PATH_PREFIX = ../class/lib: