Revert 3538.

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

diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index ad3edf3cb3db267af975bd759cb84641a300966a..b3c651cc3afa1947496c00f6fba3c21ed92c23bb 100644 (file)
--- a/gyp/animator.gyp
+++ b/gyp/animator.gyp
@@ -7,17 +7,15 @@
     {
       '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': [

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 08aa7e5dc47c53ffa11cbd0fec5f7c61a3d735c0..c60059e48f29ff513f5dbbffa3f4ad35bce01823 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -5,10 +5,6 @@
       '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',
@@ -314,6 +310,9 @@
           'ext',
         ],
       },
+      'dependencies': [
+        'opts.gyp:opts'
+      ],
     },
   ],
 }

diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index 30785236a2c8020d20f500fbd2f8943273d4e9d4..394ec30f092fed75d6d56d4c184e7900fb2fb681 100644 (file)
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -3,11 +3,9 @@
     {
       'target_name': 'effects',
       'type': 'static_library',
-      'dependencies': [
-        'core.gyp:core',
-        'ports.gyp:ports',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/effects',
       ],
       'sources': [

diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp
index 8c976dd5e987dcffa0126c8ee56dfab56799c6f9..09711ac40007c4cc182f4cffc37ab2549caa4957 100644 (file)
--- a/gyp/experimental.gyp
+++ b/gyp/experimental.gyp
@@ -3,9 +3,9 @@
     {
       'target_name': 'experimental',
       'type': 'static_library',
-      'dependencies': [
-        'core.gyp:core',
-        'ports.gyp:ports',
+      'include_dirs': [
+        '../include/config',
+        '../include/core',
       ],
       'sources': [
         '../experimental/SkSetPoly3To3.cpp',

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 1ac07aac8d68071d3f57fd24360021e82efac301..fb5dff331ba366831a986f4c18cd4de48c1d2b80 100644 (file)
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -86,12 +86,9 @@
     {
       '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',
       ],
@@ -151,9 +148,7 @@
         '../src/core', # SkRasterClip.h
       ],
       'dependencies': [
-        'core.gyp:core',
         'libtess.gyp:libtess',
-        'ports.gyp:ports',
       ],
       'sources': [
         '../include/gpu/GrClip.h',

diff --git a/gyp/images.gyp b/gyp/images.gyp
index 5ccad8bf22da3db3eb4a5cdbcd1d617b5cc1ee11..a4bdcd00ff341b937f481d18011401e2e2a698d2 100644 (file)
--- a/gyp/images.gyp
+++ b/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': [

diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index c3e251606d270eeba0b60ea0037da300d117740a..cf8e6ddbe428e7ce98da2615e3b2553d4df77ecf 100644 (file)
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -21,16 +21,9 @@
     {
       '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',
       ],
@@ -88,15 +81,9 @@
     {
       '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': [

diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 341c2cf3f38ff33948cbc1dcf272b150b7ba5cdd..73dd59497dcdc9492d3020dc46ea9cf9e42f0216 100644 (file)
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -4,20 +4,13 @@
     {
       '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/utils',
-        #ports currently implements the xml parser backend.
-        '../include/xml',
-
+        '../include/images',
+        '../include/effects',
         '../include/ports',
+        '../include/xml',
         '../src/core',
       ],
       'sources': [

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 1ecc0c210a74a1cf188f0fc54bf6c78281d90e73..2fca63fbfe547112d5829d353c17bb76502093d5 100644 (file)
--- a/gyp/utils.gyp
+++ b/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',

diff --git a/gyp/views.gyp b/gyp/views.gyp
index a0aafe69e6901ebd35b7e4ff08786fe73824f8bb..7998cd79d9a2050cfe32594bf86c16813bdb6384 100644 (file)
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -9,16 +9,14 @@
     {
       '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': [

diff --git a/gyp/views_animated.gyp b/gyp/views_animated.gyp
index b74030c595aae342aaddd0f102f281e085da4b4a..f7cd05202dd77277ca6823c027ba594b5d1f4f82 100644 (file)
--- a/gyp/views_animated.gyp
+++ b/gyp/views_animated.gyp
@@ -5,15 +5,16 @@
     {
       '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': [

diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 636398bf3dd3e46fcb22e310d954c09b93c33751..6650a5c7c80bd6c353061cb157ce496093b997a9 100644 (file)
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -3,13 +3,11 @@
     {
       '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',