From 29baacf3a5bb773d94d08d16b81c3cda45a44eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 29 Jan 2015 18:30:46 +0100
Subject: refactor makefile

---
 gyp/install.gypi | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'gyp/install.gypi')

diff --git a/gyp/install.gypi b/gyp/install.gypi
index 48a7a997db..f42ffbf238 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -6,18 +6,22 @@
           'type': 'none',
           'hard_dependency': 1,
           'dependencies': [
-            '<(core_library)',
-            '<(headless_library)',
-            '<(platform_library)',
-            '<(storage_library)',
+            'core',
+            '<(headless_lib)',
+            '<(platform_lib)',
+            '<(http_lib)',
+            '<(asset_lib)',
+            '<(cache_lib)',
             'mbgl-standalone',
           ],
           'copies': [
             { 'files': [ '<(standalone_product_dir)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-core.a' ], 'destination': '<(install_prefix)/lib' },
-            { 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' },
-            { 'files': [ '<(PRODUCT_DIR)/lib<(platform_library).a' ], 'destination': '<(install_prefix)/lib' },
-            { 'files': [ '<(PRODUCT_DIR)/lib<(storage_library).a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/lib<(headless_lib).a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/lib<(platform_lib).a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/lib<(http_lib).a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/lib<(asset_lib).a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/lib<(cache_lib).a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' },
           ],
           'variables': {
@@ -36,7 +40,7 @@
             ],
           },
           'actions': [
-              { 'action_name': 'mbgl-config',  
+              { 'action_name': 'mbgl-config',
                 'inputs': [
                     '../utils/mbgl-config/mbgl-config.template.sh',
                     '../utils/mbgl-config/build.sh',
@@ -47,7 +51,6 @@
                 'action': [
                     './utils/mbgl-config/build.sh',
                     '<(install_prefix)',
-                    '<(platform)',
                     '<@(sqlite3_static_libs)',
                     '<@(sqlite3_ldflags)',
                     '<@(curl_ldflags)',
-- 
cgit v1.2.1