X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=1aa33039794ad534742c5c08114342283f742c8b;hb=60e8c71c9f63959890ecabb70c6e2cde2f947224;hp=74c36dc27b634d8a092f922c97856495bef34b3a;hpb=9f97b4c2288b41ff235b0774174de0782f0df98b;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index 74c36dc27b6..1aa33039794 100644
--- 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:
@@ -32,8 +47,6 @@ debug-opt-prof:
 	$(Verb) $(MAKE) ENABLE_PROFILING=1
 
 dist-hook::
-	$(Echo) Eliminating CVS directories from distribution
-	$(Verb) $(RM) -rf `find $(TopDistDir) -type d -name CVS -print`
 	$(Echo) Eliminating files constructed by configure
 	$(Verb) $(RM) -f \
 	  $(TopDistDir)/include/llvm/ADT/hash_map  \
@@ -43,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
+