rework linux gyp files

gyp/mbgl-core.gypi

@@ -56,12 +56,12 @@
       ],
 
       'link_settings': {
-        'libraries': [ '<@(libraries)' ],
         'conditions': [
           ['OS == "mac"', {
+            'libraries': [ '<@(libraries)' ],
             'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
           }, {
-            'ldflags': [ '<@(ldflags)' ],
+            'libraries': [ '<@(libraries)', '<@(ldflags)' ],
           }]
         ],
       },

gyp/mbgl-headless.gypi

@@ -4,27 +4,15 @@
       'product_name': 'mbgl-headless',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'variables': {
-        'cflags_cc': [
-          '<@(uv_cflags)',
-        ],
-      },
-      'include_dirs': [
-        '../include',
-      ],
-      'conditions': [
-        ['OS == "mac"', {
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
-          }
-        }, {
-          'cflags_cc': [ '<@(cflags_cc)' ],
-        }]
-      ],
+
       'sources': [
         '../platform/default/headless_view.cpp',
         '../platform/default/headless_display.cpp',
       ],
+
+      'include_dirs': [
+        '../include',
+      ],
     },
   ],
 }

gyp/mbgl-linux.gypi

@@ -12,8 +12,6 @@
       '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',
@@ -33,7 +31,6 @@
           '<@(png_ldflags)',
           '<@(jpeg_ldflags)',
           '<@(uv_ldflags)',
-          '<@(curl_ldflags)',
           '<@(nu_ldflags)',
         ],
         'libraries': [
@@ -60,12 +57,12 @@
       ],
 
       'link_settings': {
-        'libraries': [ '<@(libraries)' ],
         'conditions': [
           ['OS == "mac"', {
+            'libraries': [ '<@(libraries)' ],
             'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
           }, {
-            'ldflags': [ '<@(ldflags)' ],
+            'libraries': [ '<@(libraries)', '<@(ldflags)' ],
           }]
         ],
       },

gyp/mbgl-storage-curl.gypi

@@ -25,16 +25,19 @@
         'cflags_cc': [
           '<@(uv_cflags)',
           '<@(sqlite3_cflags)',
+          '<@(curl_cflags)',
           '-I<(boost_root)/include',
         ],
         'ldflags': [
           '<@(uv_ldflags)',
           '<@(sqlite3_ldflags)',
+          '<@(curl_ldflags)',
           '<@(zlib_ldflags)',
         ],
         'libraries': [
           '<@(uv_static_libs)',
           '<@(sqlite3_static_libs)',
+          '<@(curl_static_libs)',
           '<@(zlib_static_libs)',
         ],
       },
@@ -50,12 +53,12 @@
       ],
 
       'link_settings': {
-        'libraries': [ '<@(libraries)' ],
         'conditions': [
           ['OS == "mac"', {
+            'libraries': [ '<@(libraries)' ],
             'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
           }, {
-            'ldflags': [ '<@(ldflags)' ],
+            'libraries': [ '<@(libraries)', '<@(ldflags)' ],
           }]
         ],
       },

linux/mapboxgl-app.gyp

@@ -34,16 +34,16 @@
         ],
       },
 
-      'libraries': [ '<@(libraries)' ],
       'conditions': [
         ['OS == "mac"', {
+          'libraries': [ '<@(libraries)' ],
           'xcode_settings': {
             'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
             'OTHER_LDFLAGS': [ '<@(ldflags)' ],
           }
         }, {
           'cflags_cc': [ '<@(cflags_cc)' ],
-          'ldflags': [ '<@(ldflags)' ],
+          'libraries': [ '<@(libraries)', '<@(ldflags)' ],
         }]
       ],