X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=4b68b97a1eb87feeeb5efccb33a0d62dbade259b;hb=22033b2a4e0330b24fd601ef36e36bb1e544bf9d;hp=85aa6d7eec7d4d7290dda8b65fe74f8bd702a4a9;hpb=6c0969696aac8fd475c55b0a9ecda5ceffb7da13;p=oota-llvm.git

diff --git a/Makefile b/Makefile
index 85aa6d7eec7..4b68b97a1eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,49 +1,105 @@
-##===- ./Makefile ------------------------------------------*- Makefile -*-===##
+#===- ./Makefile -------------------------------------------*- Makefile -*--===#
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file was developed by the LLVM research group and is distributed under
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
+
 LEVEL = .
-DIRS = lib/Support utils lib tools 
-OPTIONAL_DIRS = projects
+DIRS = lib/System lib/Support utils lib/VMCore lib
+
+include $(LEVEL)/Makefile.config 
+
 
-ifneq ($(MAKECMDGOALS),tools-only)
-DIRS += runtime
+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
+
+    DIRS += docs
+  endif
 endif
 
-include $(LEVEL)/Makefile.common
+# 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
 
-test :: all
-	cd test; $(MAKE)
 
-distclean:: clean
-	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
-	                  $(LEVEL)/include/Config/config.h \
-	                  $(LEVEL)/autoconf/autom4te.cache \
-	                  $(LEVEL)/config.log \
-	                  $(LEVEL)/TAGS
+EXTRA_DIST := test llvm.spec include win32 Xcode
 
-tools-only: all
+# Include the main makefile machinery.
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
-# Install support for llvm include files:
-.PHONY: install-includes
+# Specify options to pass to configure script when we're
+# running the dist-check target
+DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)
 
-install-includes:
-	$(MKDIR) $(DESTDIR)$(includedir)/llvm
-	cd include && find * '!' '(' -name '*~' -o -name .cvsignore ')' -print | grep -v CVS | pax -rwdvpe $(DESTDIR)$(includedir)/llvm
+.PHONY: debug-opt-prof
+debug-opt-prof:
+	$(Echo) Building Debug Version
+	$(Verb) $(MAKE)
+	$(Echo)
+	$(Echo) Building Optimized Version
+	$(Echo)
+	$(Verb) $(MAKE) ENABLE_OPTIMIZED=1
+	$(Echo)
+	$(Echo) Building Profiling Version
+	$(Echo)
+	$(Verb) $(MAKE) ENABLE_PROFILING=1
 
-install:: install-includes
+dist-hook::
+	$(Echo) Eliminating files constructed by configure
+	$(Verb) $(RM) -f \
+	  $(TopDistDir)/include/llvm/ADT/hash_map  \
+	  $(TopDistDir)/include/llvm/ADT/hash_set  \
+	  $(TopDistDir)/include/llvm/ADT/iterator  \
+	  $(TopDistDir)/include/llvm/Config/config.h  \
+	  $(TopDistDir)/include/llvm/Support/DataTypes.h  \
+	  $(TopDistDir)/include/llvm/Support/ThreadSupport.h
 
-# Build tags database for Emacs/Xemacs:
-.PHONY: tags
+tools-only: all
+libs-only: all
 
-TAGS: tags
+#------------------------------------------------------------------------
+# 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:: tags
+all-local:: $(FilesToConfigPATH)
+$(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in 
+	$(Echo) Regenerating $*
+	$(Verb) cd $(LLVM_OBJ_ROOT) && $(ConfigStatusScript) $*
+.PRECIOUS: $(FilesToConfigPATH)
 
-tags:
-	$(ETAGS) $(ETAGSFLAGS) `find $(wildcard $(SourceDir)/include $(SourceDir)/lib $(SourceDir)/tools) -name '*.cpp' -o -name '*.h'`
+# 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