diff options
| author | James Zern <jzern@google.com> | 2014-06-10 15:58:59 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-10 15:58:59 -0700 |
| commit | 3659fbd38c881a7bc24eadfddfc7e1fabe1fa517 (patch) | |
| tree | 144cd0bcd653716d56efdfca675675a0329ef928 /build/make | |
| parent | 5556d1184169168e59656863456c88c3f958ca45 (diff) | |
| parent | 4f83315d18c93036be3c07d144b0226bbe762468 (diff) | |
| download | libvpx-3659fbd38c881a7bc24eadfddfc7e1fabe1fa517.tar libvpx-3659fbd38c881a7bc24eadfddfc7e1fabe1fa517.tar.gz libvpx-3659fbd38c881a7bc24eadfddfc7e1fabe1fa517.tar.bz2 libvpx-3659fbd38c881a7bc24eadfddfc7e1fabe1fa517.zip | |
Merge "Makefile: skip .d inclusion for 'testdata' target"
Diffstat (limited to 'build/make')
| -rw-r--r-- | build/make/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 63ec271b7..dc61429a9 100644 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -330,7 +330,10 @@ endef ifneq ($(target),) include $(SRC_PATH_BARE)/$(target:-$(TOOLCHAIN)=).mk endif -ifeq ($(filter %clean,$(MAKECMDGOALS)),) + +skip_deps := $(filter %clean,$(MAKECMDGOALS)) +skip_deps += $(findstring testdata,$(MAKECMDGOALS)) +ifeq ($(strip $(skip_deps)),) # Older versions of make don't like -include directives with no arguments ifneq ($(filter %.d,$(OBJS-yes:.o=.d)),) -include $(filter %.d,$(OBJS-yes:.o=.d)) |