make this work again: ./gyp_skia && make SampleApp

see http://codereview.appspot.com/4517123/



git-svn-id: http://skia.googlecode.com/svn/trunk@1454 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/SampleApp.gyp

@@ -116,7 +116,7 @@
         '../samplecode/SampleFontCache.cpp',
       ],
       'dependencies': [
-        'skia.gyp:skia',
+        'core.gyp:core',
         'effects.gyp:effects',
         'images.gyp:images',
         'views.gyp:views',

gyp/all.gyp

+# Creates a Makefile that is capable of building all executable targets.
+{
+  'targets': [
+    {
+      'target_name': 'all',
+      'type': 'none',
+      'dependencies': [
+        'SampleApp.gyp:SampleApp'
+      ],
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:

gyp/skia.gyp → gyp/core.gyp

+# Core Skia library code.
 {
   'includes': [
     'target_defaults.gypi',
   ],
   'targets': [
     {
-      'target_name': 'skia',
+      'target_name': 'core',
       'type': 'static_library',
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
       'sources': [

gyp/gyp_skia

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # This script is a wrapper which invokes gyp with the correct --depth argument,
-# and supports the automatic regeneration of build files if skia.gyp is 
+# and supports the automatic regeneration of build files if all.gyp is 
 # changed (Linux-only).
 
 import glob
@@ -61,10 +61,10 @@ if __name__ == '__main__':
       gyp_file_specified = True
       break
 
-  # If we didn't get a file, then fall back to assuming 'skia.gyp' from the
+  # If we didn't get a file, then fall back to assuming 'all.gyp' from the
   # same directory as the script.
   if not gyp_file_specified:
-    args.append(os.path.join(script_dir, 'skia.gyp'))
+    args.append(os.path.join(script_dir, 'all.gyp'))
 
   args.extend(['-I' + i for i in additional_include_files(args)])