Silence -pedantic warning.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index a56fca48b106c3b5e85e4ffb1b6bd5fe73cd4ee8..d917e58811f60b15602de377ef6adc7608731aee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,25 +7,27 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore 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
@@ -74,3 +76,16 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
        $(Echo) Regenerating $*
        $(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.
+all:: 
+       $(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
+ifeq ($(BuildMode),Debug)
+       $(Echo) '*****' Note: Debug build can be 10 times slower than an
+       $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
+       $(Echo) '*****' make an optimized build.
+endif
+
+check-llvm2cpp:
+       $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1