summaryrefslogtreecommitdiff
path: root/scripts/main.mk
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/main.mk')
-rw-r--r--scripts/main.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/main.mk b/scripts/main.mk
index dae3782a68..3639a780a7 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -16,10 +16,6 @@ HOST_VERSION ?= $(BUILD_VERSION)
export MASON_PLATFORM=$(HOST)
export MASON_PLATFORM_VERSION=$(HOST_VERSION)
-ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
- CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
-endif
-
HOST_SLUG = $(HOST)-$(HOST_VERSION)
CONFIGURE_FILES = scripts/$(HOST)/configure.sh
ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
@@ -38,7 +34,6 @@ default: ;
#### Dependencies ##############################################################
-ifneq (,$(wildcard .git/.))
SUBMODULES += .mason/mason.sh
.mason/mason.sh:
./scripts/flock.py .git/Submodule.lock git submodule update --init .mason
@@ -47,6 +42,10 @@ SUBMODULES += styles/styles
styles/styles:
./scripts/flock.py .git/Submodule.lock git submodule update --init styles
+SUBMODULES += src/mbgl/util/geojsonvt/geojsonvt.hpp
+src/mbgl/util/geojsonvt/geojsonvt.hpp:
+ ./scripts/flock.py .git/Submodule.lock git submodule update --init src/mbgl/util/geojsonvt
+
ifeq ($(HOST),ios)
SUBMODULES += platform/ios/vendor/SMCalloutView/SMCalloutView.h
platform/ios/vendor/SMCalloutView/SMCalloutView.h:
@@ -56,7 +55,6 @@ SUBMODULES += test/ios/KIF/KIF.xcodeproj
test/ios/KIF/KIF.xcodeproj:
./scripts/flock.py .git/Submodule.lock git submodule update --init test/ios/KIF
endif
-endif
# Wildcard targets get removed after build by default, but we want to preserve the config.
.PRECIOUS: config/%.gypi