refactor makefile

1 files changed, 14 insertions, 27 deletions

diff --git a/mbgl.gyp b/mbgl.gyp
index 8ad17e87d4..e25f4a2352 100644
--- a/mbgl.gyp
+++ b/mbgl.gyp
@@ -5,34 +5,21 @@
     './gyp/version.gypi',
     './gyp/styles.gypi',
     './gyp/certificates.gypi',
-    './gyp/mbgl-core.gypi',
-    './gyp/mbgl-headless.gypi',
-    './gyp/mbgl-standalone.gypi',
+    './gyp/standalone.gypi',
+    './gyp/core.gypi',
+    './gyp/none.gypi',
   ],
-
   'conditions': [
-    ['platform == "osx"', {
-      'includes': [
-        './gyp/mbgl-osx.gypi',
-        './gyp/mbgl-storage-cocoa.gypi',
-      ],
-    }],
-    ['platform == "ios"', {
-      'includes': [
-        './gyp/mbgl-ios.gypi',
-        './gyp/mbgl-storage-cocoa.gypi',
-      ],
-    }],
-    ['platform == "linux"', {
-      'includes': [
-        './gyp/mbgl-linux.gypi',
-        './gyp/mbgl-storage-curl.gypi',
-      ],
-    }],
-    ['platform == "android"', {
-      'includes': [
-        './gyp/mbgl-android.gypi'
-      ],
-    }],
+    ['headless_lib == "cgl"', { 'includes': [ './gyp/headless-cgl.gypi' ] } ],
+    ['headless_lib == "glx"', { 'includes': [ './gyp/headless-glx.gypi' ] } ],
+    ['platform_lib == "osx"', { 'includes': [ './gyp/platform-osx.gypi' ] } ],
+    ['platform_lib == "ios"', { 'includes': [ './gyp/platform-ios.gypi' ] } ],
+    ['platform_lib == "linux"', { 'includes': [ './gyp/platform-linux.gypi' ] } ],
+    ['platform_lib == "android"', { 'includes': [ './gyp/platform-android.gypi' ] } ],
+    ['http_lib == "curl"', { 'includes': [ './gyp/http-curl.gypi' ] } ],
+    ['http_lib == "nsurl"', { 'includes': [ './gyp/http-nsurl.gypi' ] } ],
+    ['asset_lib == "fs"', { 'includes': [ './gyp/asset-fs.gypi' ] } ],
+    ['asset_lib == "zip"', { 'includes': [ './gyp/asset-zip.gypi' ] } ],
+    ['cache_lib == "sqlite"', { 'includes': [ './gyp/cache-sqlite.gypi' ] } ],
   ],
 }