Revamp this to use filter-out, which makes the logic simpler and not nested.

This restores building of examples and projects!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29297 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-07-26 19:10:34 +00:00
parent dd3f6aa91f
commit 5720be4138

View File

@ -7,38 +7,34 @@
# #
#===------------------------------------------------------------------------===# #===------------------------------------------------------------------------===#
LEVEL = . LEVEL := .
DIRS = lib/System lib/Support utils lib/VMCore lib 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 include $(LEVEL)/Makefile.config
# llvm-gcc4 doesn't need runtime libs.
ifeq ($(MAKECMDGOALS),tools-only) ifeq ($(LLVMGCC_MAJVERS),4)
DIRS += tools DIRS := $(filter-out runtime, $(DIRS))
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 endif
# Don't install utils, they are only used to build LLVM. ifeq ($(MAKECMDGOALS),libs-only)
# DIRS := $(filter-out tools runtime docs, $(DIRS))
ifeq ($(MAKECMDGOALS),install)
DIRS := $(filter-out utils, $(DIRS))
# Don't install examples or projects.
OPTIONAL_DIRS := OPTIONAL_DIRS :=
endif endif
ifeq ($(MAKECMDGOALS),tools-only)
DIRS := $(filter-out runtime docs, $(DIRS))
OPTIONAL_DIRS :=
endif
EXTRA_DIST := test llvm.spec include win32 Xcode # Don't install utils, examples, or projects they are only used to
# build LLVM.
ifeq ($(MAKECMDGOALS),install)
DIRS := $(filter-out utils, $(DIRS))
OPTIONAL_DIRS :=
endif
# Include the main makefile machinery. # Include the main makefile machinery.
include $(LLVM_SRC_ROOT)/Makefile.rules include $(LLVM_SRC_ROOT)/Makefile.rules
@ -103,3 +99,4 @@ endif
check-llvm2cpp: check-llvm2cpp:
$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1 $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1