diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-29 18:51:29 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-29 18:51:29 +0000 |
| commit | 686989b2422678bebf7693b6db674a55818936f2 (patch) | |
| tree | a8160647a9a2edf9993ee779b34d0a2a3c494629 /Makefile | |
| parent | 375ff85e96cf0f8438ea0b11be67e85474e42c29 (diff) | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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: |