X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=4b68b97a1eb87feeeb5efccb33a0d62dbade259b;hb=cf0063171995c97ee52dfdf5d6bbbe090d2f5f03;hp=d3c6e6c0fdd7c0c7d18af3c082774559093f49c7;hpb=38ab6d887c660c7e2fe08707e8f982ab451fb224;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index d3c6e6c0fdd..4b68b97a1eb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,42 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
+
 LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore lib
+
+include $(LEVEL)/Makefile.config 
 
-include $(LEVEL)/Makefile.common
 
 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
+
     DIRS += docs
   endif
-  OPTIONAL_DIRS = examples projects
 endif
-EXTRA_DIST := test llvm.spec include
+
+# Don't install utils, they are only used to build LLVM.
+#
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+
+  # Don't install examples or projects.
+  OPTIONAL_DIRS :=
+endif
+
+
+EXTRA_DIST := test llvm.spec include win32 Xcode
+
+# Include the main makefile machinery.
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're
 # running the dist-check target
@@ -85,3 +101,5 @@ ifeq ($(BuildMode),Debug)
 	$(Echo) '*****' make an optimized build.
 endif
 
+check-llvm2cpp:
+	$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1