summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-03-10 19:31:13 -0300
committerJames Almer <jamrial@gmail.com>2019-03-10 19:31:13 -0300
commit06476249cd2332e30b66576633b2827adf3478dd (patch)
treeb977685c57c04c49897d7210c58790dcd8f1035f /tests
parent715186456c556d94265e6376a38941c17d6a0ad6 (diff)
parent7e5bde93a1e7641e1622814dafac0be3f413d79b (diff)
downloadffmpeg-06476249cd2332e30b66576633b2827adf3478dd.tar.gz
Merge commit '7e5bde93a1e7641e1622814dafac0be3f413d79b'
* commit '7e5bde93a1e7641e1622814dafac0be3f413d79b': build: Rename OBJDIRS variable to OUTDIRS Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile2
-rw-r--r--tests/checkasm/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 90801b42b2..0e809770ae 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -10,7 +10,7 @@ FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF)
$(AREF): CMP=
APITESTSDIR := tests/api
-OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/
+OUTDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/
$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)./$< 'tests/vsynth1/'
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 47b7b06d28..8cc0bff2d1 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -62,7 +62,7 @@ CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS)))
$(CHECKASMOBJS): | $(CHECKASMDIRS)
-OBJDIRS += $(CHECKASMDIRS)
+OUTDIRS += $(CHECKASMDIRS)
tests/checkasm/checkasm.o: CFLAGS += -Umain