X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=b48b49b16762ee9f6e6b75fe626fe8dbeef6271b;hb=a773bd54f32ceb55af08286fe00c6ec1b73e5b9a;hp=d2a4fbf0224f7bbe84d100d26cc62f4ca0e0832d;hpb=df561f4ab347736cc513ef0483d9049987ac32c9;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index d2a4fbf0224..b48b49b1676 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,42 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
-LEVEL = .
-DIRS = lib/System lib/Support utils lib tools 
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime
-OPTIONAL_DIRS = examples projects
+LEVEL := .
+DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
+OPTIONAL_DIRS := examples projects
+EXTRA_DIST := test llvm.spec include win32 Xcode
+
+include $(LEVEL)/Makefile.config 
+
+# llvm-gcc4 doesn't need runtime libs.
+ifeq ($(LLVMGCC_MAJVERS),4)
+  DIRS := $(filter-out runtime, $(DIRS))
+endif
+
+ifeq ($(MAKECMDGOALS),libs-only)
+  DIRS := $(filter-out tools runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
+ifeq ($(MAKECMDGOALS),tools-only)
+  DIRS := $(filter-out runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+  OPTIONAL_DIRS :=
 endif
 
-EXTRA_DIST := test llvm.spec include
+# Include the main makefile machinery.
+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 +57,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,10 +66,37 @@ dist-hook::
 	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
 	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
-check :: 
-	cd test; $(MAKE) 
-
 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
+
+check-llvm2cpp:
+	$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
 
-check-dejagnu:
-	$(MAKE) -C test check-dejagnu TESTSUITE=$(TESTSUITE)