summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 15:07:57 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-22 15:07:57 -0700
commita7527d6986418c0560c4704f8684a81ce83178db (patch)
tree4aa7e8d04afedd98fe0b862dc6e76992f10ba8db /Makefile
parent0c5d805bf9ac14eeaaaef8c08281a3e6f33ddb0b (diff)
downloadqtlocation-mapboxgl-a7527d6986418c0560c4704f8684a81ce83178db.tar.gz
[build] Depend on directories, so that projects are regenerated when files are added or removed (#4810)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1534db8494..86691c4b43 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,10 @@ RUN = +$(MAKE) -f scripts/main.mk
default:
@printf "You must specify a valid target\n"
+# Depend on gyp includes plus directories, so that projects are regenerated when
+# files are added or removed.
+GYP_DEPENDENCIES = mbgl.gypi test/test.gypi bin/*.gypi $(shell find src include -type d)
+
#### OS X targets ##############################################################
OSX_OUTPUT_PATH = build/osx
@@ -34,7 +38,7 @@ $(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh .mason configu
$(OSX_OUTPUT_PATH)/mbgl.xcconfig: $(OSX_OUTPUT_PATH)/config.gypi
./scripts/export-xcconfig.py $< $@
-$(OSX_PROJ_PATH): platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi $(OSX_OUTPUT_PATH)/mbgl.xcconfig mbgl.gypi test/test.gypi bin/*.gypi
+$(OSX_PROJ_PATH): platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi $(OSX_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES)
./deps/run_gyp -f xcode --depth=. --generator-output=$(OSX_OUTPUT_PATH) $<
osx: $(OSX_PROJ_PATH)
@@ -69,7 +73,7 @@ $(IOS_OUTPUT_PATH)/config.gypi: platform/ios/scripts/configure.sh .mason configu
$(IOS_OUTPUT_PATH)/mbgl.xcconfig: $(IOS_OUTPUT_PATH)/config.gypi
./scripts/export-xcconfig.py $< $@
-$(IOS_PROJ_PATH): platform/ios/platform.gyp $(IOS_OUTPUT_PATH)/config.gypi $(IOS_OUTPUT_PATH)/mbgl.xcconfig mbgl.gypi test/test.gypi
+$(IOS_PROJ_PATH): platform/ios/platform.gyp $(IOS_OUTPUT_PATH)/config.gypi $(IOS_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES)
./deps/run_gyp -f xcode --depth=. --generator-output=$(IOS_OUTPUT_PATH) $<
ios: $(IOS_PROJ_PATH)