diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-29 18:30:46 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:09 +0100 |
| commit | 29baacf3a5bb773d94d08d16b81c3cda45a44eb6 (patch) | |
| tree | 1dc3ca456151138ee5e8b7cf88b3afcecc3df1db /gyp/install.gypi | |
| parent | 3d51e116a84ee168975bcee8377e9156f77e2731 (diff) | |
| download | qtlocation-mapboxgl-29baacf3a5bb773d94d08d16b81c3cda45a44eb6.tar.gz | |
refactor makefile
Diffstat (limited to 'gyp/install.gypi')
| -rw-r--r-- | gyp/install.gypi | 21 |
1 files changed, 12 insertions, 9 deletions
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)', |