gyp: generate "everything" and "most" targets instead of "all"
"make all" at the toplevel now chains to "make everything"
BUG=http://code.google.com/p/skia/issues/detail?id=932
Review URL: https://codereview.appspot.com/6651064
git-svn-id: http://skia.googlecode.com/svn/trunk@6116 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/make.py b/make.py
index 03421fe..faee183 100644
--- a/make.py
+++ b/make.py
@@ -24,7 +24,6 @@
TARGET_CLEAN = 'clean'
TARGET_DEFAULT = 'most'
TARGET_GYP = 'gyp'
-LIST_OF_ALL_TARGETS = ['SampleApp', 'bench', 'gm', 'tests', 'tools']
SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
OUT_SUBDIR = 'out'
@@ -141,8 +140,11 @@
targets = []
for arg in args:
+ # If user requests "make all", chain to our explicitly-declared "everything"
+ # target. See https://code.google.com/p/skia/issues/detail?id=932 ("gyp
+ # automatically creates "all" target on some build flavors but not others")
if arg == TARGET_ALL:
- targets.extend(LIST_OF_ALL_TARGETS)
+ targets.append('everything')
elif arg == TARGET_CLEAN:
MakeClean()
elif arg.startswith('BUILDTYPE='):