Merge pull request #103 from XTZGZoReX/master

[mono.git] / mcs / tools / Makefile

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 1c79bc30a312d3a202c42a3301c46adccd19052d..e0442cccf4586948502970974b2ae09df65a6240 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -1,76 +1,61 @@
 thisdir = tools
 
-net_1_1_dirs := \
-       al                      \
-       cilc            \
-       ictool          \
-       mono-xsd        \
-       security        \
-       wsdl            \
-       genxs           \
-       disco           \
-       soapsuds        \
-       browsercaps-updater     \
-       monop           \
-       gacutil         \
-       cil-strip       \
-       resgen          \
-       macpack         \
-       mkbundle        \
-       dtd2rng         \
-       dtd2xsd         \
-       mjs                     \
-       prj2make        \
-       mono-service    \
-       monodoc         \
-       mod             \
-       compiler-tester \
-       installvst              \
-       installutil
-
-net_2_0_dirs := \
+per_profile_dirs = \
        al              \
-       corcompare      \
-       culevel         \
        linker          \
        tuner           \
-       csharplib       \
-       csharp          \
+       culevel         \
+       genxs           \
+       mkbundle        \
+       monop           \
+       mono-service    \
        mono-xsd        \
+       resgen          \
+       gacutil         \
        wsdl            \
-       mono-xmltool    \
+       xbuild
+
+net_4_0_dirs := \
+       $(per_profile_dirs) \
+       csharp          \
+       corcompare      \
        compiler-tester \
-       monop           \
-       xbuild          \
-       resgen          \
-       monodoc         \
-       mdoc            \
-       mono-service    \
+       mono-xmltool    \
        mono-shlib-cop  \
-       mkbundle        \
        sgen            \
-       security        \
        mconfig         \
        installutil     \
        nunitreport     \
        pdb2mdb         \
        sqlsharp        \
        sqlmetal        \
-       gacutil         \
-       svcutil
+       svcutil         \
+       ictool          \
+       disco           \
+       soapsuds        \
+       browsercaps-updater     \
+       cil-strip       \
+       macpack         \
+       dtd2rng         \
+       dtd2xsd         \
+       mod             \
+       installvst      \
+       lc              \
+       mono-configuration-crypto \
+       ccrewrite       \
+       security
 
-net_2_1_dirs := \
-       compiler-tester
+net_2_0_dirs := \
+       $(per_profile_dirs) \
+       monodoc         \
+       mdoc
 
-basic_SUBDIRS = gacutil security
-net_2_0_bootstrap_SUBDIRS = resgen culevel
-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)
-net_4_0_bootstrap_SUBDIRS = resgen culevel
-net_4_0_SUBDIRS := $(net_2_0_dirs)
+build_SUBDIRS = gacutil security culevel
+net_2_0_SUBDIRS := $(basic_SUBDIRS) $(net_2_0_dirs)
+net_4_0_SUBDIRS := $(net_4_0_dirs) $(basic_SUBDIRS)
 
-SUBDIRS = $(net_1_1_SUBDIRS) $(net_2_0_SUBDIRS) $(net_2_1_SUBDIRS)
+SUBDIRS = $(basic_SUBDIRS) $(net_2_0_SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS) $(net_4_0_dirs)
 
 include ../build/rules.make
 
@@ -82,10 +67,9 @@ DISTFILES = \
        scan-tests.pl                   \
        tinderbox/smtp.c                \
        tinderbox/tinderbox.sh          \
-       gensources.sh                   \
        removecomments.sh
 
-test-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local doc-update-local:
+test-local csproj-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local doc-update-local:
        @:
 
 dist-local: dist-default