From b85c3253b8c117d563b68d910ed835eac8c90823 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 26 Jul 2006 19:10:34 +0000 Subject: Revamp this to use filter-out, which makes the logic simpler and not nested. This restores building of examples and projects! llvm-svn: 29297 --- llvm/Makefile | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/llvm/Makefile b/llvm/Makefile index 4b68b97a1eb8..b48b49b16762 100644 --- a/llvm/Makefile +++ b/llvm/Makefile @@ -7,39 +7,35 @@ # #===------------------------------------------------------------------------===# -LEVEL = . -DIRS = lib/System lib/Support utils lib/VMCore lib +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 += 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 +99,4 @@ endif check-llvm2cpp: $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1 + -- cgit v1.2.1