diff --git a/tools/Makefile b/tools/Makefile
index 78d7fa0b23..076c191850 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,14 +3,32 @@ TOP=..
 include $(TOP)/Make.config
 
 ifdef INCLUDE_MAC
+ifdef INCLUDE_XAMARIN_LEGACY
 SUBDIRS+=mmp
 endif
+endif
 
-SUBDIRS+=mtouch xibuild mlaunch siminstaller nnyeah
+ifdef INCLUDE_XAMARIN_LEGACY
+SUBDIRS += mtouch
+endif
 
+ifdef INCLUDE_XAMARIN_LEGACY
+SUBDIRS += xibuild
+endif
+
+SUBDIRS+=mlaunch siminstaller
+
+ifdef ENABLE_DOTNET
+ifdef INCLUDE_XAMARIN_LEGACY
+SUBDIRS += nnyeah
+endif
+endif
+
+ifdef INCLUDE_XAMARIN_LEGACY
 ifdef ENABLE_INSTALL_SOURCE
 SUBDIRS += install-source
 endif
+endif
 
 ifdef ENABLE_DOTNET
 SUBDIRS += dotnet-linker