Now can re-enable debug label folding.

[oota-llvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 4b68b97a1eb87feeeb5efccb33a0d62dbade259b..c45ac976ddf0e75e1c4e3657d64b0a8c8e910de7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,39 +7,46 @@
 # 
 #===------------------------------------------------------------------------===#
 
-LEVEL = .
-DIRS = lib/System lib/Support utils lib/VMCore lib
+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
+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 += 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
+  DIRS := $(filter-out runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
 endif
 
-# Don't install utils, they are only used to build LLVM.
-#
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
 ifeq ($(MAKECMDGOALS),install)
   DIRS := $(filter-out utils, $(DIRS))
-
-  # Don't install examples or projects.
   OPTIONAL_DIRS :=
 endif
 
-
-EXTRA_DIST := test llvm.spec include win32 Xcode
-
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
@@ -103,3 +110,11 @@ endif
 
 check-llvm2cpp:
        $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+
+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
+
+.PHONY: srpm rpm