Commit 686989b2 authored by djsollen@google.com's avatar djsollen@google.com
Browse files

Fix build by reverting make all to not include the debugger

git-svn-id: http://skia.googlecode.com/svn/trunk@4412 2bbb7eff-a529-9590-31e7-b0007b416f81
parent 375ff85e
......@@ -29,7 +29,7 @@
BUILDTYPE ?= Debug
CWD := $(shell pwd)
ALL_TARGETS := core SampleApp bench gm tests tools debugger
ALL_TARGETS := core SampleApp bench gm tests tools
ifneq (,$(findstring skia_os=android, $(GYP_DEFINES)))
ALL_TARGETS += SkiaAndroidApp
......@@ -37,7 +37,7 @@ endif
# Default target. This must be listed before all other targets.
.PHONY: default
default: core SampleApp bench gm tests tools
default: $(ALL_TARGETS)
# As noted in http://code.google.com/p/skia/issues/detail?id=330 , building
# multiple targets in parallel was failing. The special .NOTPARALLEL target
......@@ -58,6 +58,11 @@ all: $(ALL_TARGETS)
clean:
rm -rf out xcodebuild
# Add the debugger to the target list after the 'all' target is defined so that the
# debugger is only executed with 'make debugger' and not 'make all' as well. The reason
# for this is unless the user has Qt installed the debugger target will fail.
ALL_TARGETS += debugger
# Run gyp no matter what.
.PHONY: gyp
gyp:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment