Explicit 'all' target overrides implicit 'all' target.

pylib/gyp/generator/make.py

Index: pylib/gyp/generator/make.py
===================================================================
--- pylib/gyp/generator/make.py	(revision 1521)
+++ pylib/gyp/generator/make.py	(working copy)
@@ -2056,10 +2056,12 @@
   gyp.common.CopyTool(flavor, dest_path)
 
   # Find the list of targets that derive from the gyp file(s) being built.
+  user_all_target = False
   needed_targets = set()
   for build_file in params['build_files']:
     for target in gyp.common.AllTargets(target_list, target_dicts, build_file):
       needed_targets.add(target)
+      user_all_target |= gyp.common.ParseQualifiedTarget(target)[1] == 'all'
 
   build_files = set()
   include_list = set()
@@ -2100,7 +2102,8 @@
 
     writer = MakefileWriter(generator_flags, flavor)
     writer.Write(qualified_target, base_path, output_file, spec, configs,
-                 part_of_all=qualified_target in needed_targets)
+                 part_of_all=qualified_target in needed_targets and
+                             not user_all_target)
 
     # Our root_makefile lives at the source root.  Compute the relative path
     # from there to the output_file for including.