2003-04-24 Ville Palo <vi64pa@kolumbus.fi>

[mono.git] / mcs / makefile

diff --git a/mcs/makefile b/mcs/makefile
index ec3455a599c36754e70726fe1d2161469e97212e..abb8dcb786830380bb8e40fc2ec5daf3d03bb09b 100755 (executable)
--- a/mcs/makefile
+++ b/mcs/makefile
@@ -1,17 +1,17 @@
 VERSION=0.13.99
 
-DIRS=jay nant mcs class nunit nunit20 monoresgen tools mbas
+DIRS=jay nant mcs class nunit20 monoresgen tools mbas ilasm
 INSTALL= /usr/bin/install
 
 all: 
-       if test x$(OS) = xWindows_NT; then make linux; else make -f makefile.gnu; fi
+       if test x$(OS) = xWindows_NT; then make windows; else make -f makefile.gnu; fi
 
 install:
-       if test x$(OS) = xWindows_NT; then make windowsinstall; else make -f makefile.gnu install; fi
+       if test x$(OS) = xWindows_NT; then make windows install; else make -f makefile.gnu install; fi
 
 windows:
        for i in $(DIRS); do                    \
-               (cd $$i; make linux) || exit 1; \
+               (cd $$i; make windows) || exit 1;       \
        done
 
 linux:
@@ -22,10 +22,15 @@ linux:
 test:
        if test x$(OS) = xWindows_NT; then make testwindows; else make -f makefile.gnu test; fi
 
+testcorlib:
+       if test x$(OS) = xWindows_NT; then make testcorlibwindows; else make -f makefile.gnu testcorlib; fi
+
 testwindows:
-       (cd nunit; make)
-       (cd nunit20; make)
-       (cd class; make test)
+       $(MAKE) -C nunit20
+       $(MAKE) -C class test
+
+testcorlibwindows:
+       $(MAKE) -C class testcorlib
 
 clean:
        if test x$(OS) = xWindows_NT; then make cleanwindows; else make cleanlinux; fi
@@ -64,6 +69,9 @@ windowsinstall:
        done
 
 MONO_WIN_INSTALL_LIB=  \
+       class/lib/Accessibility.dll     \
+       class/lib/ICSharpCode.SharpZipLib.dll \
+       class/lib/ByteFX.Data.dll \
        class/lib/I18N.CJK.dll  \
        class/lib/I18N.MidEast.dll      \
        class/lib/I18N.Other.dll        \
@@ -71,35 +79,45 @@ MONO_WIN_INSTALL_LIB=       \
        class/lib/I18N.West.dll \
        class/lib/I18N.dll      \
        class/lib/Microsoft.VisualBasic.dll     \
+       class/lib/Microsoft.VisualC.dll \
+       class/lib/Mono.Data.dll \
+       class/lib/Mono.Data.DB2Client.dll       \
        class/lib/Mono.Data.MySql.dll   \
        class/lib/Mono.Data.PostgreSqlClient.dll        \
        class/lib/Mono.Data.SqliteClient.dll    \
        class/lib/Mono.Data.SybaseClient.dll    \
        class/lib/Mono.Data.Tds.dll     \
        class/lib/Mono.Data.TdsClient.dll       \
+       class/lib/Mono.Directory.LDAP.dll       \
+       class/lib/Mono.GetOptions.dll   \
        class/lib/Mono.PEToolkit.dll    \
+       class/lib/Mono.Posix.dll        \
+       class/lib/Mono.Security.dll     \
+       class/lib/Mono.Security.Win32.dll       \
+       class/lib/Npgsql.dll    \
+       class/lib/PEAPI.dll     \
        class/lib/System.Configuration.Install.dll      \
        class/lib/System.Data.dll       \
+       class/lib/System.Data.OracleClient.dll  \
+       class/lib/System.Design.dll     \
        class/lib/System.Drawing.dll    \
        class/lib/System.EnterpriseServices.dll \
+       class/lib/System.Management.dll \
        class/lib/System.Runtime.Remoting.dll   \
        class/lib/System.Runtime.Serialization.Formatters.Soap.dll      \
+       class/lib/System.Security.dll   \
+       class/lib/System.ServiceProcess.dll     \
        class/lib/System.Web.Services.dll       \
        class/lib/System.Web.dll        \
+       class/lib/System.Windows.Forms.dll      \
        class/lib/System.Xml.dll        \
        class/lib/System.dll    \
-       class/lib/corlib.dll    \
-       class/lib/corlib_cmp.dll        \
-       nunit/NUnitBase.dll     \
-       nunit/NUnitCore.dll     \
-       nunit/NUnitCore_mono.dll
+       class/lib/corlib.dll
 
 MONO_WIN_INSTALL_BIN=  \
        mcs/mcs.exe     \
        mbas/mbas.exe   \
        nant/NAnt.exe   \
-       nunit/NUnitConsole.exe  \
-       nunit/NUnitConsole_mono.exe     \
        ilasm/ilasm.exe \
        monoresgen/monoresgen.exe       \
        tools/EnumCheck.exe     \
@@ -108,4 +126,4 @@ MONO_WIN_INSTALL_BIN=       \
        tools/GenerateDelegate.exe      \
        tools/monostyle.exe     \
        tools/SqlSharp/sqlsharp.exe     \
-       tools/corcompare/CorCompare.exe
+