[core] move mbgl.gyp to gyp directory

So npm won't clobber binding.gyp, refs
https://github.com/npm/npm/issues/10243

4 files changed, 39 insertions, 12 deletions

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 1156059e0b..a1bf41a0e1 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -11,14 +11,14 @@
       ],
 
       'sources': [
-        '<!@(find src -name "*.hpp")',
-        '<!@(find src -name "*.cpp")',
-        '<!@(find src -name "*.c")',
-        '<!@(find src -name "*.h")',
-        '<!@(find include -name "*.hpp")',
-        '<!@(find include -name "*.h")',
-        '<!@(find src -name "*.glsl")',
-        'bin/style.json'
+        '<!@(find ../src -name "*.hpp")',
+        '<!@(find ../src -name "*.cpp")',
+        '<!@(find ../src -name "*.c")',
+        '<!@(find ../src -name "*.h")',
+        '<!@(find ../include -name "*.hpp")',
+        '<!@(find ../include -name "*.h")',
+        '<!@(find ../src -name "*.glsl")',
+        '../bin/style.json'
       ],
 
       'include_dirs': [
diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp
new file mode 100644
index 0000000000..c2c8d9c261
--- /dev/null
+++ b/gyp/mbgl.gyp
@@ -0,0 +1,27 @@
+{
+  'includes': [
+    'common.gypi',
+    'shaders.gypi',
+    'version.gypi',
+    'certificates.gypi',
+    'standalone.gypi',
+    'core.gypi',
+    'none.gypi',
+  ],
+  'conditions': [
+    ['headless_lib == "cgl" and host == "osx"', { 'includes': [ 'headless-cgl.gypi' ] } ],
+    ['headless_lib == "glx" and host == "linux"', { 'includes': [ 'headless-glx.gypi' ] } ],
+    ['platform_lib == "osx" and host == "osx"', { 'includes': [ 'platform-osx.gypi' ] } ],
+    ['platform_lib == "ios" and host == "ios"', { 'includes': [ 'platform-ios.gypi' ] } ],
+    ['platform_lib == "linux"', { 'includes': [ 'platform-linux.gypi' ] } ],
+    ['platform_lib == "android" and host == "android"', { 'includes': [ 'platform-android.gypi' ] } ],
+    ['http_lib == "curl"', { 'includes': [ 'http-curl.gypi' ] } ],
+    ['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ 'http-nsurl.gypi' ] } ],
+    ['http_lib == "android" and host == "android"', { 'includes': [ 'http-android.gypi' ] } ],
+    ['asset_lib == "fs"', { 'includes': [ 'asset-fs.gypi' ] } ],
+    ['asset_lib == "zip"', { 'includes': [ 'asset-zip.gypi' ] } ],
+    ['cache_lib == "sqlite"', { 'includes': [ 'cache-sqlite.gypi' ] } ],
+
+    ['install_prefix != ""', { 'includes': ['install.gypi' ] } ],
+  ],
+}
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 6b9dd50274..3dabc19867 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -94,7 +94,7 @@
         'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
         'CLANG_ENABLE_OBJC_ARC': 'YES',
         'CLANG_ENABLE_MODULES': 'YES',
-        'FRAMEWORK_SEARCH_PATHS': './platform/ios/vendor',
+        'FRAMEWORK_SEARCH_PATHS': '../platform/ios/vendor',
       },
 
       'link_settings': {
@@ -109,7 +109,7 @@
           '../include',
         ],
         'mac_bundle_resources': [
-          '<!@(find ./platform/ios/resources -type f \! -name "README")',
+          '<!@(find ../platform/ios/resources -type f \! -name "README")',
         ],
       },
     },
diff --git a/gyp/shaders.gypi b/gyp/shaders.gypi
index fbf8e3197b..8004874376 100644
--- a/gyp/shaders.gypi
+++ b/gyp/shaders.gypi
@@ -9,14 +9,14 @@
           'action_name': 'Build Shaders',
           'inputs': [
             '../scripts/build-shaders.py',
-            '<!@(find src -name "*.glsl")'
+            '<!@(find ../src -name "*.glsl")'
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
           ],
-          'action': ['scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
+          'action': ['../scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
         }
       ],
       'direct_dependent_settings': {