[llvm-commits] CVS: llvm/Makefile

[Chris Lattner]

Changes in directory llvm:

Makefile updated: 1.61 -> 1.62
---
Log message:

More of PR728: http://llvm.cs.uiuc.edu/PR728 , don't install utils either.


---
Diffs of the changes:  (+14 -4)

 Makefile |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.61 llvm/Makefile:1.62
--- llvm/Makefile:1.61	Fri Jun  2 17:34:39 2006
+++ llvm/Makefile	Fri Jun  2 17:41:18 2006
@@ -6,11 +6,13 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
+
 LEVEL = .
 DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 
+
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
 else
@@ -22,15 +24,23 @@
       $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
     endif
 
-    # Don't install examples or projects.
-    ifneq ($(MAKECMDGOALS),install)
-      OPTIONAL_DIRS := examples projects
-    endif
     DIRS += docs
   endif
 endif
+
+# 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
+
+
 EXTRA_DIST := test llvm.spec include win32 Xcode
 
+# Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're