one too many l's

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 4c6f7097fd9f25a9cd134a9724aab10a60e78e40..1aa33039794ad534742c5c08114342283f742c8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,31 @@
 # 
 #===------------------------------------------------------------------------===#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib tools 
+DIRS = lib/System lib/Support utils lib
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime docs
-OPTIONAL_DIRS = examples projects
+include $(LEVEL)/Makefile.config 
+
+ifeq ($(MAKECMDGOALS),tools-only)
+  DIRS += tools
+else
+  ifneq ($(MAKECMDGOALS),libs-only)
+    DIRS += tools
+    ifneq ($(LLVMGCC_MAJVERS),4)
+      DIRS += runtime
+    else
+      $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
+    endif
+    OPTIONAL_DIRS := examples projects
+    DIRS += docs
+  endif
 endif
+EXTRA_DIST := test llvm.spec include win32 Xcode
 
-EXTRA_DIST := test llvm.spec include
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
-include $(LEVEL)/Makefile.common
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
 
 .PHONY: debug-opt-prof
 debug-opt-prof:
@@ -41,7 +56,34 @@ dist-hook::
          $(TopDistDir)/include/llvm/Support/DataTypes.h  \
          $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
-check : 
-       $(MAKE) -C test check TESTSUITE=$(TESTSUITE)
-
 tools-only: all
+libs-only: all
+
+#------------------------------------------------------------------------
+# Make sure the generated headers are up-to-date. This must be kept in
+# sync with the AC_CONFIG_HEADER invocations in autoconf/configure.ac
+#------------------------------------------------------------------------
+FilesToConfig := \
+  include/llvm/Config/config.h \
+  include/llvm/Support/DataTypes.h \
+  include/llvm/ADT/hash_map \
+  include/llvm/ADT/hash_set \
+  include/llvm/ADT/iterator
+FilesToConfigPATH  := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
+
+all-local:: $(FilesToConfigPATH)
+$(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
+