Fix srcdir <> objdir builds with ocaml 2.10. Downrev versions don't care whether

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index f40eb2bc4c2770d84d784c4157a1a4c427680c92..c367e731acd2ab2920528c3add6cafb22ab012f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,51 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
-LEVEL = .
-DIRS = lib/System lib/Support utils lib
 
-include $(LEVEL)/Makefile.common
+LEVEL := .
+
+# Top-Level LLVM Build Stages:
+#   1. Build lib/System and lib/Support, which are used by utils (tblgen).
+#   2. Build utils, which is used by VMCore.
+#   3. Build VMCore, which builds the Intrinsics.inc file used by libs.
+#   4. Build libs, which are needed by llvm-config.
+#   5. Build llvm-config, which determines inter-lib dependencies for tools.
+#   6. Build tools, runtime, docs.
+#
+DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+        tools runtime docs
+
+OPTIONAL_DIRS := examples projects bindings
+EXTRA_DIST := test llvm.spec include win32 Xcode
+
+include $(LEVEL)/Makefile.config 
+
+# llvm-gcc4 doesn't need runtime libs.  llvm-gcc4 is the only supported one.
+# FIXME: Remove runtime entirely once we have an understanding of where
+# libprofile etc should go.
+#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 += tools
-else
-  ifneq ($(MAKECMDGOALS),libs-only)
-    DIRS += tools
-    ifeq ($(LLVMGCC_MAJVERS),3)
-      DIRS += runtime
-    else
-      $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
-    endif
-    DIRS += docs
-  endif
-  OPTIONAL_DIRS = examples projects
+  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 := $(filter bindings, $(OPTIONAL_DIRS))
 endif
-EXTRA_DIST := test llvm.spec include
+
+# Include the main makefile machinery.
+include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're
 # running the dist-check target
@@ -75,8 +100,8 @@ $(FilesToConfigPATH) : $(LLVM_OBJ_ROOT)/% : $(LLVM_SRC_ROOT)/%.in
        $(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.
+# 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)
@@ -84,3 +109,31 @@ ifeq ($(BuildMode),Debug)
        $(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
        $(Echo) '*****' make an optimized build.
 endif
+
+check-llvm2cpp:
+       $(Verb)$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+
+check-one:
+       $(Verb)$(MAKE) -C test check-one TESTONE=$(TESTONE)
+
+srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+       rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
+
+rpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+       rpmbuild -bb --target $(TARGET_TRIPLE) $(LLVM_OBJ_ROOT)/llvm.spec
+
+show-footprint:
+       $(Verb) du -sk $(LibDir)
+       $(Verb) du -sk $(ToolDir)
+       $(Verb) du -sk $(ExmplDir)
+       $(Verb) du -sk $(ObjDir)
+
+build-for-llvm-top:
+       $(Verb) if test ! -f ./config.status ; then \
+         ./configure --prefix="$(LLVM_TOP)/install" \
+           --with-llvm-gcc="$(LLVM_TOP)/llvm-gcc" ; \
+       fi
+       $(Verb) $(MAKE) tools-only
+
+.PHONY: srpm rpm
+