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
diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index b3c651c..ad3edf3 100644
--- a/gyp/animator.gyp
+++ b/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': [
diff --git a/gyp/core.gyp b/gyp/core.gyp
index c60059e..08aa7e5 100644
--- a/gyp/core.gyp
+++ b/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'
- ],
},
],
}
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index 394ec30..3078523 100644
--- a/gyp/effects.gyp
+++ b/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': [
diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp
index 09711ac..8c976dd 100644
--- a/gyp/experimental.gyp
+++ b/gyp/experimental.gyp
@@ -3,9 +3,9 @@
{
'target_name': 'experimental',
'type': 'static_library',
- 'include_dirs': [
- '../include/config',
- '../include/core',
+ 'dependencies': [
+ 'core.gyp:core',
+ 'ports.gyp:ports',
],
'sources': [
'../experimental/SkSetPoly3To3.cpp',
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index fb5dff3..1ac07aa 100644
--- a/gyp/gpu.gyp
+++ b/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',
diff --git a/gyp/images.gyp b/gyp/images.gyp
index a4bdcd0..5ccad8b 100644
--- 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 cf8e6dd..c3e2516 100644
--- a/gyp/opts.gyp
+++ b/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': [
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 73dd594..341c2cf 100644
--- a/gyp/ports.gyp
+++ b/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/effects',
- '../include/ports',
+ '../include/utils',
+ #ports currently implements the xml parser backend.
'../include/xml',
+
+ '../include/ports',
'../src/core',
],
'sources': [
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2fca63f..1ecc0c2 100644
--- 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 7998cd7..a0aafe6 100644
--- a/gyp/views.gyp
+++ b/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': [
diff --git a/gyp/views_animated.gyp b/gyp/views_animated.gyp
index f7cd052..b74030c 100644
--- a/gyp/views_animated.gyp
+++ b/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': [
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 6650a5c..636398b 100644
--- a/gyp/xml.gyp
+++ b/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',