New build system from Peter Williams (peter@newton.cx)

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

4 files changed, 8 insertions, 74 deletions

diff --git a/mcs/class/Mono.Directory.LDAP/Makefile b/mcs/class/Mono.Directory.LDAP/Makefile
new file mode 100644
index 00000000000..985bbb7cf55
--- /dev/null
+++ b/mcs/class/Mono.Directory.LDAP/Makefile
@@ -0,0 +1,8 @@
+thisdir = class/Mono.Directory.LDAP
+SUBDIRS = 
+include ../../build/rules.make
+
+LIBRARY = Mono.Directory.LDAP.dll
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Data.dll
+
+include ../../build/library.make
diff --git a/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP.build b/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP.build
deleted file mode 100644
index 38ea0f2e9fc..00000000000
--- a/mcs/class/Mono.Directory.LDAP/Mono.Directory.LDAP.build
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>

-

-<!-- NAnt build file for Mono.Directory.LDAP.dll -->

-

-<project name="Mono.Directory.LDAP" default="build">

-	<property name="debug" value="false"/>

-

-	<target name="build">

-		<csc target="library" output="../lib/Mono.Directory.LDAP.dll" debug="${debug}">

-			<arg value="/nowarn:1595"/>

-			<arg value="/nowarn:0067"/>

-			<arg value="/nowarn:0109"/>

-			<arg value="/nowarn:0169"/>

-			<arg value="/nowarn:0649"/>

-			<arg value="/unsafe"/>

-			<arg value="/noconfig"/>

-			<arg value="/lib:../lib/"/>

-			<arg value="/r:corlib.dll"/>

-			

-			<sources>

-				<includes name="**/*.cs"/> 

-				<excludes name="Test/**"/>				

-			</sources>

-		</csc>

-	</target>

-	<target name="test" depends="build">

-		<nant basedir="Test" target="test"/>

-	</target>

-	<target name="clean">

-		<delete file="../lib/Mono.Directory.LDAP.dll" failonerror="false"/>

-	</target>

-</project>

diff --git a/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu b/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu
deleted file mode 100644
index 78b48947d07..00000000000
--- a/mcs/class/Mono.Directory.LDAP/Test/makefile.gnu
+++ /dev/null
@@ -1,28 +0,0 @@
-topdir = ../../..
-
-LIBRARY = dslib_linux_test.dll
-
-LIB_LIST = dslib_linux_test.args
-LIB_FLAGS =     \
-                -r $(topdir)/class/lib/corlib.dll \
-                -r $(topdir)/class/lib/System.dll \
-                -r $(topdir)/class/lib/Mono.Directory.LDAP.dll \
-                -r $(topdir)/nunit20/NUnit.Framework.dll
-
-ifdef SUBDIR
-USE_SOURCE_RULES=1
-SOURCES_INCLUDE=./$(SUBDIR)/*.cs
-SOURCES_EXCLUDE=_DUMMY_
-endif
-
-include $(topdir)/class/library.make
-
-NUNITCONSOLE=$(topdir)/nunit20/nunit-console.exe
-MONO_PATH = $(topdir)/nunit20:.
-
-test: $(LIBRARY) run_test
-
-.PHONY: run_test
-
-run_test:
-        -MONO_PATH=$(MONO_PATH) mono --debug $(NUNITCONSOLE) $(LIBRARY)
diff --git a/mcs/class/Mono.Directory.LDAP/makefile.gnu b/mcs/class/Mono.Directory.LDAP/makefile.gnu
deleted file mode 100644
index 31c2b7535ae..00000000000
--- a/mcs/class/Mono.Directory.LDAP/makefile.gnu
+++ /dev/null
@@ -1,14 +0,0 @@
-topdir = ../..
-
-TEST_DIR= Test
-LIBRARY = $(topdir)/class/lib/Mono.Directory.LDAP.dll
-
-LIB_LIST = list
-LIB_FLAGS = -r corlib -r System -r System.Data -r mscorlib
-
-SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=./Test*
-
-export MONO_PATH_PREFIX = $(topdir)/class/lib:
-
-include $(topdir)/class/library.make