2002-08-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* makefile.gnu:
	* src/NUnitConsole/makefile.gnu: some modifications to use the other
	makefiles and build dll and exe on linux.

	* src/makefile.gnu: New file.
	* src/NUnitCore/list.unix: New file.
	* src/NUnitCore/makefile.gnu: New file.

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

6 files changed, 83 insertions, 12 deletions

diff --git a/mcs/nunit/ChangeLog b/mcs/nunit/ChangeLog
index 2508bd83791..8bb9241b14c 100644
--- a/mcs/nunit/ChangeLog
+++ b/mcs/nunit/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* makefile.gnu:
+	* src/NUnitConsole/makefile.gnu: some modifications to use the other
+	makefiles and build dll and exe on linux.
+
+	* src/makefile.gnu: New file.
+	* src/NUnitCore/list.unix: New file.
+	* src/NUnitCore/makefile.gnu: New file.
+
 2002-08-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* makefile.gnu: make it use the freshly built mcs.
diff --git a/mcs/nunit/makefile.gnu b/mcs/nunit/makefile.gnu
index e3683ab655f..8e0268a8702 100644
--- a/mcs/nunit/makefile.gnu
+++ b/mcs/nunit/makefile.gnu
@@ -1,14 +1,11 @@
-topdir = ..
+DIRS =	src
 
-LIBRARY = ../class/lib/NUnitCore_mono.dll
+default: all
 
-LIB_LIST = list.unix
-LIB_FLAGS = -r ../class/lib/corlib.dll -r ../class/lib/System.dll
-
-SOURCES_INCLUDE=./src/NUnitCore/*.cs
-SOURCES_EXCLUDE=/dev/null
-
-export MONO_PATH_PREFIX = ../class/lib:
-
-include ../class/library.make
+all install clean:
+	@for i in $(DIRS) ; do \
+		if [ -d "$$i" ] && [ -f "$$i/makefile.gnu" ] ; then	\
+			$(MAKE) -C $$i -f makefile.gnu $@ || exit 1; \
+		fi	\
+	done
 
diff --git a/mcs/nunit/src/NUnitConsole/makefile.gnu b/mcs/nunit/src/NUnitConsole/makefile.gnu
index bc7e78aa0ad..ebf5f90dd60 100644
--- a/mcs/nunit/src/NUnitConsole/makefile.gnu
+++ b/mcs/nunit/src/NUnitConsole/makefile.gnu
@@ -5,7 +5,7 @@ PROGRAM_LIST = list.unix
 PROGRAM_FLAGS =	\
 	-r ../../../class/lib/corlib.dll	\
 	-r ../../../class/lib/System.dll 	\
-	-r ../../../class/lib/NUnitCore_mono.dll
+	-r ../NUnitCore/NUnitCore_mono.dll
 
 include ../../../class/executable.make
 
diff --git a/mcs/nunit/src/NUnitCore/list.unix b/mcs/nunit/src/NUnitCore/list.unix
new file mode 100644
index 00000000000..feea26597ff
--- /dev/null
+++ b/mcs/nunit/src/NUnitCore/list.unix
@@ -0,0 +1,32 @@
+ActiveTestSuite.cs
+AssemblyInfo.cs
+AssemblyTestCollector.cs
+Assertion.cs
+AssertionFailedError.cs
+BaseTestRunner.cs
+ClassPathTestCollector.cs
+ExceptionTestCase.cs
+ExpectExceptionAttribute.cs
+IFailureDetailView.cs
+IProtectable.cs
+ITestCollector.cs
+ITest.cs
+ITestListener.cs
+ITestLoader.cs
+ITestSuiteLoader.cs
+LoadingTestCollector.cs
+NUnitException.cs
+ReflectionUtils.cs
+ReloadingTestSuiteLoader.cs
+RepeatedTest.cs
+SimpleTestCollector.cs
+StandardLoader.cs
+StandardTestSuiteLoader.cs
+TestCaseClassLoader.cs
+TestCase.cs
+TestDecorator.cs
+TestFailure.cs
+TestResult.cs
+TestSetup.cs
+TestSuite.cs
+Version.cs
diff --git a/mcs/nunit/src/NUnitCore/makefile.gnu b/mcs/nunit/src/NUnitCore/makefile.gnu
new file mode 100644
index 00000000000..9ece6da9a2d
--- /dev/null
+++ b/mcs/nunit/src/NUnitCore/makefile.gnu
@@ -0,0 +1,21 @@
+topdir = ../../..
+
+LIBRARY = NUnitCore_mono.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=\
+	SimpleTestCollector.cs		\
+	ClassPathTestCollector.cs	\
+	ReflectionUtils.cs		\
+	ITestSuiteLoader.cs		\
+	LoadingTestCollector.cs		\
+	ReloadingTestSuiteLoader.cs	\
+	StandardTestSuiteLoader.cs	\
+	TestCaseClassLoader.cs
+
+MONO_PATH=$(topdir)/class/lib
+
+include $(topdir)/class/library.make
diff --git a/mcs/nunit/src/makefile.gnu b/mcs/nunit/src/makefile.gnu
new file mode 100644
index 00000000000..ee1cb2f3669
--- /dev/null
+++ b/mcs/nunit/src/makefile.gnu
@@ -0,0 +1,11 @@
+DIRS =	NUnitCore NUnitConsole
+
+default: all
+
+all install clean:
+	@for i in $(DIRS) ; do \
+		if [ -d "$$i" ] && [ -f "$$i/makefile.gnu" ] ; then	\
+			$(MAKE) -C $$i -f makefile.gnu $@ || exit 1; \
+		fi	\
+	done
+