Correct dependencies in gyp files.

http://codereview.appspot.com/5934044/


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

gyp/animator.gyp

@@ -7,15 +7,17 @@
     {
       'target_name': 'animator',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'effects.gyp:effects',
+        'images.gyp:images',
+        'ports.gyp:ports',
+        'utils.gyp:utils',
+        'views.gyp:views',
+        'xml.gyp:xml',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../include/effects',
         '../include/animator',
-        '../include/views',
-        '../include/xml',
-        '../include/utils',
-        '../include/images',
         '../src/utils',
       ],
       'sources': [

gyp/core.gyp

@@ -5,6 +5,10 @@
       'target_name': 'core',
       'type': 'static_library',
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
+      'dependencies': [
+        'opts.gyp:opts',
+        'ports.gyp:ports',
+      ],
       'sources': [
         '../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
         '../src/core/Sk64.cpp',
@@ -310,9 +314,6 @@
           'ext',
         ],
       },
-      'dependencies': [
-        'opts.gyp:opts'
-      ],
     },
   ],
 }

gyp/effects.gyp

@@ -3,9 +3,11 @@
     {
       'target_name': 'effects',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'ports.gyp:ports',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/effects',
       ],
       'sources': [

gyp/experimental.gyp

@@ -3,9 +3,9 @@
     {
       'target_name': 'experimental',
       'type': 'static_library',
-      'include_dirs': [
+      'dependencies': [
-        '../include/config',
+        'core.gyp:core',
-        '../include/core',
+        'ports.gyp:ports',
       ],
       'sources': [
         '../experimental/SkSetPoly3To3.cpp',

gyp/gpu.gyp

@@ -86,9 +86,12 @@
     {
       'target_name': 'skgr',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'gpu.gyp:gr',
+        'ports.gyp:ports',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../src/core',
         '../include/gpu',
       ],
@@ -148,7 +151,9 @@
         '../src/core', # SkRasterClip.h
       ],
       'dependencies': [
+        'core.gyp:core',
         'libtess.gyp:libtess',
+        'ports.gyp:ports',
       ],
       'sources': [
         '../include/gpu/GrClip.h',

gyp/images.gyp

@@ -4,12 +4,12 @@
       'target_name': 'images',
       'type': 'static_library',
       'dependencies': [
+        'core.gyp:core',
         'libjpeg.gyp:libjpeg',
+        'ports.gyp:ports',
         'utils.gyp:utils',
       ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/images',
       ],
       'sources': [

gyp/opts.gyp

@@ -21,9 +21,16 @@
     {
       'target_name': 'opts',
       'type': 'static_library',
+      'dependencies': [
+        #opts depends on core, but core also depends on opts.
+        #'core.gyp:core',
+        'opts.gyp:opts_ssse3',
+        'ports.gyp:ports',
+      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
+
         '../src/core',
         '../src/opts',
       ],
@@ -81,9 +88,15 @@
     {
       'target_name': 'opts_ssse3',
       'type': 'static_library',
+      'dependencies': [
+        #opts_ssse3 depends on core, but core also depends on opts_ssse3.
+        #'core.gyp:core',
+        'ports.gyp:ports',
+      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
+
         '../src/core',
       ],
       'conditions': [

gyp/ports.gyp

@@ -4,13 +4,20 @@
     {
       'target_name': 'ports',
       'type': 'static_library',
+      'dependencies': [
+        #ports depends on core, but core also depends on ports.
+        #'core.gyp:core',
+        #ports depends on utils, but utils also depends on ports.
+        #'utils.gyp:utils',
+      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
-        '../include/images',
+        '../include/utils',
-        '../include/effects',
+        #ports currently implements the xml parser backend.
-        '../include/ports',
         '../include/xml',
+
+        '../include/ports',
         '../src/core',
       ],
       'sources': [

gyp/utils.gyp

@@ -3,15 +3,15 @@
     {
       'target_name': 'utils',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'ports.gyp:ports',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/utils',
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
-        '../include/effects',
-        '../include/xml',
       ],
       'sources': [
         '../include/utils/SkBoundaryPatch.h',

gyp/views.gyp

@@ -9,14 +9,16 @@
     {
       'target_name': 'views',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'effects.gyp:effects',
+        'images.gyp:images',
+        'ports.gyp:ports',
+        'utils.gyp:utils',
+        'xml.gyp:xml',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/views',
-        '../include/xml',
-        '../include/utils',
-        '../include/images',
-        '../include/effects',
         '../include/views/unix',
       ],
       'sources': [

gyp/views_animated.gyp

@@ -5,16 +5,15 @@
     {
       'target_name': 'views_animated',
       'type': 'static_library',
+      'dependencies': [
+        'animator.gyp:animator',
+        'core.gyp:core',
+        'images.gyp:images',
+        'ports.gyp:ports',
+        'views.gyp:views',
+        'xml.gyp:xml',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../include/views',
-        '../include/xml',
-        '../include/utils',
-        '../include/images',
-        '../include/animator',
-        '../include/effects',
-        '../include/views/unix',
         '../include/views/animated',
       ],
       'sources': [

gyp/xml.gyp

@@ -3,11 +3,13 @@
     {
       'target_name': 'xml',
       'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+        'ports.gyp:ports',
+        'utils.gyp:utils',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/xml',
-        '../include/utils',
       ],
       'sources': [
         '../include/xml/SkBML_WXMLParser.h',