From 311bf93abe9f815668e8e0a779c87c3eb5c1199d Mon Sep 17 00:00:00 2001
From: Lucas Wojciechowski <lucas@mapbox.com>
Date: Wed, 16 Sep 2015 16:27:53 -0700
Subject: Revert "[node] Enable npm to build mapbox-gl-native package from
 source"

This reverts commit 4e1ead344bfb1f9ddb207924465fabae3d218d67.
---
 gyp/core.gypi    | 5 -----
 gyp/version.gypi | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'gyp')

diff --git a/gyp/core.gypi b/gyp/core.gypi
index 51009be698..f9b361032e 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -31,14 +31,10 @@
           '<@(libuv_cflags)',
           '<@(opengl_cflags)',
           '<@(boost_cflags)',
-          '<@(geojsonvt_cflags)',
-          '<@(variant_cflags)',
         ],
         'cflags': [
           '<@(libuv_cflags)',
           '<@(opengl_cflags)',
-          '<@(geojsonvt_cflags)',
-          '<@(variant_cflags)',
           '-fPIC'
         ],
         'ldflags': [
@@ -47,7 +43,6 @@
         ],
         'libraries': [
           '<@(libuv_static_libs)',
-          '<@(geojsonvt_static_libs)',
         ],
       },
 
diff --git a/gyp/version.gypi b/gyp/version.gypi
index 4efdd079a8..1cc2eb351f 100644
--- a/gyp/version.gypi
+++ b/gyp/version.gypi
@@ -13,7 +13,7 @@
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp',
           ],
-          'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)'],
+          'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=0)', '<!@(git rev-parse HEAD)'],
         }
       ],
       'direct_dependent_settings': {
-- 
cgit v1.2.1