diff --git a/tools/Makefile b/tools/Makefile
index 83c54e274d0..cdfdacb08ea 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,20 +10,17 @@
 LEVEL := ..
 PARALLEL_DIRS := llvm-as llvm-dis opt gccas llc llvm-link lli gccld llvm-stub \
                  analyze extract llvm-nm llvm-prof llvm-ar llvm-ranlib \
-		 llvm-bcanalyzer llvmc llvm-ld 
+                 llvm-bcanalyzer llvmc llvm-ld llvm-db bugpoint
+
+include $(LEVEL)/Makefile.config
 
 # The bugpoint and llvm-db tools are not portable to Win32 because they depend
 # on fork(2) behavior that Win32 doesn't have. At some point they'll be 
 # rewritten to not depend on fork at which time they should be added back to
 # the list above.
-ifneq($(OS),Win32)
-PARALLEL_DIRS += bugpoint llvm-db 
+
+ifneq ($(OS),Win32)
+PARALLEL_DIRS := $(filter-out bugpoint llvm-db,$(PARALLEL_DIRS))
 endif
 
-include $(LEVEL)/Makefile.config
-
-ifeq ($(ARCH), Sparc)
-PARALLEL_DIRS := $(filter-out llee, $(PARALLEL_DIRS))
-endif
-
-include $(LEVEL)/Makefile.common
+include $(BUILD_SRC_ROOT)/Makefile.rules