treat DefaultWsdlHelpGenerator.jvm.aspx as DefaultWsdlHelpGenerator.aspx; correctly...

[mono.git] / mcs / class / Makefile

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 0c1402c9972db7fa393810dba85383265ed7b5e8..bafce898d59703371303ee3cc1ad0d8d6e28a18b 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -29,47 +29,49 @@ net_1_1_java_SUBDIRS = \
        System.Runtime.Serialization.Formatters.Soap    \
        System.Runtime.Remoting
 
-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 = \
+common_dirs := \
        corlib                          \
        System                          \
        System.XML                      \
        Mono.Security                   \
-       System.Configuration    \
        System                          \
        System.Security                 \
+       System.Configuration            \
+       System                          \
+       System.XML                      \
        I18N                            \
        System.Drawing                  \
        System.EnterpriseServices       \
        Mono.C5                         \
        Mono.Data.Tds                   \
+       System.Transactions             \
        System.Data                     \
        Mono.Data                       \
        Mono.GetOptions                 \
+       $(MONO_SYMBOLWRITER)            \
+       $(MONO_POSIX)                   \
+       Accessibility                   \
+       Managed.Windows.Forms           \
        System.Web                      \
        System.Web.Services             \
+       System.Web                      \
        System.Runtime.Serialization.Formatters.Soap \
        System.Runtime.Remoting         \
        System.Configuration.Install    \
        System.Management               \
-       $(MONO_SYMBOLWRITER)            \
-       $(MONO_POSIX)                   \
+       Mono.Data.Sqlite                \
        Mono.Data.SqliteClient          \
        Mono.Data.SybaseClient          \
        Mono.Data.TdsClient             \
        System.Data.OracleClient        \
-       Accessibility                   \
        Microsoft.VisualC               \
        Cscompmgd                       \
-       Managed.Windows.Forms           \
-       Microsoft.VisualBasic           \
        System.Design                   \
        PEAPI                           \
        Npgsql                          \
+       Compat.ICSharpCode.SharpZipLib  \
        ICSharpCode.SharpZipLib         \
+       Compat.ICSharpCode.SharpZipLib  \
        ByteFX.Data                     \
        Commons.Xml.Relaxng             \
        Novell.Directory.Ldap           \
@@ -83,19 +85,32 @@ SUBDIRS = \
        Mono.Cairo                      \
        IBM.Data.DB2                    \
        Microsoft.JScript               \
-       FirebirdSql.Data.Firebird
+       CustomMarshalers                \
+       OpenSystem.C
+
+default_dirs := FirebirdSql.Data.Firebird
+
+net_2_0_dirs := \
+       System.Core                     \
+       Microsoft.Build.Framework       \
+       Microsoft.Build.Utilities       \
+       Microsoft.Build.Engine          \
+       Microsoft.Build.Tasks
 
-# Starting with Microsoft.Vsa, the libraries above weren't in the
-# Linux makefile.gnu before, but they build fine, so might as well
-# include them ...
-#
+default_SUBDIRS := $(common_dirs) $(default_dirs)
+net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
+
+include ../build/rules.make
+
+SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
 # I wrote makefiles for them.
 
+BROKEN_SUBDIRS =
+
 DIST_ONLY_SUBDIRS = \
-       Custommarshalers                \
-       Mono.Globalization
+       $(BROKEN_SUBDIRS)
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess
@@ -120,12 +135,11 @@ all-local $(STD_TARGETS:=-local):
 basic_files = mcs.exe mscorlib.dll System.dll System.Xml.dll
 monolite_files = $(basic_files:%=lib/monolite/%)
 
-DIST_PROFILE_DIRS = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
-
 lib/monolite:
        $(MKINSTALLDIRS) $@
 
-$(monolite_files): lib/monolite/%: lib/basic/% lib/monolite
+$(monolite_files): | lib/monolite
+$(monolite_files): lib/monolite/%: lib/basic/%
        cp -p $< $@
 
 $(basic_files:%=lib/basic/%):
@@ -133,4 +147,3 @@ $(basic_files:%=lib/basic/%):
 
 dist-default: $(monolite_files)
 dist-local: dist-default
-       -$(MKINSTALLDIRS) $(DIST_PROFILE_DIRS:%=$(distdir)/lib/%)