1 files changed, 31 insertions, 32 deletions
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index ae873c5a9e..85fc4a5127 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -8,19 +8,27 @@
       'dependencies': [
         'version',
       ],
+
+      'sources': [
+        '../platform/default/log_stderr.cpp',
+        '../platform/default/string_stdlib.cpp',
+        '../platform/default/http_request_curl.cpp',
+        '../platform/default/asset_request_libuv.cpp',
+        '../platform/default/application_root.cpp',
+        '../platform/default/image.cpp',
+        '../platform/default/image_reader.cpp',
+        '../platform/default/png_reader.cpp',
+        '../platform/default/jpeg_reader.cpp',
+      ],
+
       'variables': {
         'cflags_cc': [
           '<@(png_cflags)',
           '<@(jpeg_cflags)',
           '<@(uv_cflags)',
-          '<@(curl_cflags)',
           '<@(nu_cflags)',
           '-I<(boost_root)/include',
         ],
-        'cflags': [
-          '<@(uv_cflags)',
-          '<@(nu_cflags)',
-        ],
         'ldflags': [
           '<@(png_ldflags)',
           '<@(jpeg_ldflags)',
@@ -28,54 +36,45 @@
           '<@(curl_ldflags)',
           '<@(nu_ldflags)',
         ],
-      },
-      'sources': [
-        '../platform/default/log_stderr.cpp',
-        '../platform/default/string_stdlib.cpp',
-        '../platform/default/http_request_curl.cpp',
-        '../platform/default/asset_request_libuv.cpp',
-        '../platform/default/application_root.cpp',
-        '../platform/default/image.cpp',
-        '../platform/default/image_reader.cpp',
-        '../platform/default/png_reader.cpp',
-        '../platform/default/jpeg_reader.cpp',
-      ],
-      'include_dirs': [
-        '../include',
-        '../src',
-      ],
-      'link_settings': {
         'libraries': [
           '<@(png_static_libs)',
           '<@(jpeg_static_libs)',
-          '<@(nu_static_libs)'
+          '<@(uv_static_libs)',
+          '<@(nu_static_libs)',
         ],
       },
+
+      'include_dirs': [
+        '../include',
+        '../src',
+      ],
+
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
             'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
-            'OTHER_CFLAGS': [ '<@(cflags)' ],
           }
         }, {
           'cflags_cc': [ '<@(cflags_cc)' ],
-          'cflags': [ '<@(cflags)' ],
         }]
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../include',
-        ],
+
+      'link_settings': {
+        'libraries': [ '<@(libraries)' ],
         'conditions': [
           ['OS == "mac"', {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [ '<@(ldflags)' ],
-            }
+            'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
           }, {
             'ldflags': [ '<@(ldflags)' ],
           }]
         ],
       },
+
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../include',
+        ],
+      },
     },
   ],
 }