instructions can be in different namespaces. Make sure to use the right

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index f40eb2bc4c2770d84d784c4157a1a4c427680c92..1aa33039794ad534742c5c08114342283f742c8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,23 +9,25 @@
 LEVEL = .
 DIRS = lib/System lib/Support utils lib
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config 
 
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
 else
   ifneq ($(MAKECMDGOALS),libs-only)
     DIRS += tools
-    ifeq ($(LLVMGCC_MAJVERS),3)
+    ifneq ($(LLVMGCC_MAJVERS),4)
       DIRS += runtime
     else
       $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
     endif
+    OPTIONAL_DIRS := examples projects
     DIRS += docs
   endif
-  OPTIONAL_DIRS = examples projects
 endif
-EXTRA_DIST := test llvm.spec include
+EXTRA_DIST := test llvm.spec include win32 Xcode
+
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're
 # running the dist-check target
@@ -75,8 +77,8 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
        $(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
 .PRECIOUS: $(FilesToConfigPATH)
 
-#NOTE: THis needs to remain as the last target definition in this file so
-#that it gets executed last.
+# NOTE: This needs to remain as the last target definition in this file so
+# that it gets executed last.
 all:: 
        $(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
@@ -84,3 +86,4 @@ ifeq ($(BuildMode),Debug)
        $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
        $(Echo) '*****' make an optimized build.
 endif
+