diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-24 08:29:51 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-24 09:55:02 -0700 |
| commit | c02d837a337f04966e7ea6223ec72138bc42c1a6 (patch) | |
| tree | b623b4d0f69ed63137cfb81b08fc2576cacc9b20 /Makefile | |
| parent | 6938970dcca56bceef2045b73c114cba8ceb37e0 (diff) | |
| download | qtlocation-mapboxgl-c02d837a337f04966e7ea6223ec72138bc42c1a6.tar.gz | |
[build] Add GYP_DEPENDENCIES to all appropriate targets
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -151,7 +151,7 @@ define ANDROID_RULES build/android-$1/config.gypi: platform/android/scripts/configure.sh .mason configure $$(shell $(ANDROID_ENV) $1) ./configure $$< $$@ android $1 -build/android-$1/Makefile: build/android-$1/config.gypi +build/android-$1/Makefile: build/android-$1/config.gypi $(GYP_DEPENDENCIES) $$(shell $(ANDROID_ENV) $1) deps/run_gyp platform/android/platform.gyp -I$$< \ -Dcoverage= -Goutput_dir=. --depth=. --generator-output=build/android-$1 -f make-android @@ -183,12 +183,12 @@ node_modules: package.json $(NODE_OUTPUT_PATH)/config.gypi: platform/$(HOST_PLATFORM)/scripts/configure.sh .mason configure ./configure $< $@ $(HOST_PLATFORM) $(shell uname -m) -node: $(NODE_OUTPUT_PATH)/config.gypi node_modules +node: $(NODE_OUTPUT_PATH)/config.gypi node_modules $(GYP_DEPENDENCIES) $(NODE_PRE_GYP) configure --clang -- -I$< \ -Dcoverage= -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= $(NODE_PRE_GYP) build --clang -xnode: $(NODE_OUTPUT_PATH)/config.gypi +xnode: $(NODE_OUTPUT_PATH)/config.gypi $(GYP_DEPENDENCIES) $(NODE_PRE_GYP) configure --clang -- -I$< \ -Dcoverage= -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= \ -f xcode @@ -212,7 +212,7 @@ QT_ENV = $(shell MASON_PLATFORM_VERSION=$(shell uname -m) ./platform/qt/scripts/ $(QT_OUTPUT_PATH)/config.gypi: platform/qt/scripts/configure.sh .mason configure $(QT_ENV) ./configure $< $@ $(HOST_PLATFORM) $(shell uname -m) -$(QT_MAKEFILE): $(QT_OUTPUT_PATH)/config.gypi +$(QT_MAKEFILE): $(QT_OUTPUT_PATH)/config.gypi $(GYP_DEPENDENCIES) $(QT_ENV) deps/run_gyp platform/qt/platform.gyp -I$< -Dcoverage=$(ENABLE_COVERAGE) \ -Goutput_dir=. --depth=. --generator-output=$(QT_OUTPUT_PATH) -f make @@ -243,7 +243,7 @@ LINUX_MAKEFILE = $(LINUX_OUTPUT_PATH)/Makefile $(LINUX_OUTPUT_PATH)/config.gypi: platform/linux/scripts/configure.sh .mason configure ./configure $< $@ linux $(shell uname -m) -$(LINUX_MAKEFILE): $(LINUX_OUTPUT_PATH)/config.gypi +$(LINUX_MAKEFILE): $(LINUX_OUTPUT_PATH)/config.gypi $(GYP_DEPENDENCIES) deps/run_gyp platform/linux/platform.gyp -I$< -Dcoverage=$(ENABLE_COVERAGE) \ -Goutput_dir=. --depth=. --generator-output=$(LINUX_OUTPUT_PATH) -f make |