2008-10-17 Jb Evain <jbevain@novell.com>

	* Makefile: clean the Makefile, following the pattern in ../class,
	to make it easier to add tools.

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

diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index 97bc1ba9a40f64e9b96fc5a41bd1596c2b8c38a8..14831e29bfbcb92d935b6e3686cdbaf956529431 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-17  Jb Evain  <jbevain@novell.com>
+
+       * Makefile: clean the Makefile, following the pattern in ../class,
+       to make it easier to add tools.
+
 2008-10-16  Jonathan Pryor <jpryor@novell.com>
 
        * Makefile (DIST_ONLY_SUBDIRS): Add mono-shlib-cop; fixes the build.

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 9fe81422fd0361129361c5d1e8be4b4f448c184b..26ac1932b8acb5251bb00e2439409ceeabea767b 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -1,21 +1,57 @@
 thisdir = tools
-SUBDIRS = \
-       al cilc corcompare culevel ictool mono-xsd security wsdl genxs \
-       disco soapsuds browsercaps-updater monop gacutil linker tuner cil-strip \
-       resgen macpack mkbundle dtd2rng dtd2xsd mjs prj2make mono-service \
-       compiler-tester mono-xmltool installvst installutil
+
+net_1_1_dirs := \
+       al                      \
+       cilc            \
+       corcompare      \
+       culevel         \
+       ictool          \
+       mono-xsd        \
+       security        \
+       wsdl            \
+       genxs           \
+       disco           \
+       soapsuds        \
+       browsercaps-updater     \
+       monop           \
+       gacutil         \
+       linker          \
+       tuner           \
+       cil-strip       \
+       resgen          \
+       macpack         \
+       mkbundle        \
+       dtd2rng         \
+       dtd2xsd         \
+       mjs                     \
+       prj2make        \
+       mono-service    \
+       compiler-tester \
+       mono-xmltool    \
+       installvst              \
+       installutil
+
+net_2_0_dirs := \
+       xbuild          \
+       sgen            \
+       mconfig         \
+       nunitreport     \
+       sqlsharp        \
+       csharp          \
+       csharplib       \
+       mono-shlib-cop
+
+net_2_1_dirs := \
+       compiler-tester
 
 net_1_1_bootstrap_SUBDIRS = gacutil security resgen culevel
+net_1_1_SUBDIRS := $(net_1_1_dirs)
 net_2_0_bootstrap_SUBDIRS = resgen
+net_2_0_SUBDIRS := $(net_2_0_dirs)
+net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
+net_2_1_SUBDIRS := $(net_2_1_dirs) tuner
 
-net_2_0_SUBDIRS = \
-       al corcompare csharp mono-xsd wsdl compiler-tester monop xbuild resgen \
-       mono-service mono-shlib-cop mkbundle sgen security mconfig installutil nunitreport sqlsharp \
-       gacutil csharplib
-net_2_1_raw_SUBDIRS = compiler-tester
-net_2_1_SUBDIRS = compiler-tester tuner
-
-DIST_ONLY_SUBDIRS = xbuild sgen mconfig nunitreport sqlsharp csharp csharplib mono-shlib-cop
+SUBDIRS = $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs)
 
 include ../build/rules.make