X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=725758eca18a9ae87949efd2803148b663cd0d9b;hb=5319f48a5753772e5c04c022a0ed903d8ceecbd1;hp=4ed003b7a5badd23f1cab48e2d2d6f488b96293a;hpb=737eb5976f6a37703923ce3c3d5e6ca8eeabb43a;p=ffmpeg diff --git a/Makefile b/Makefile index 4ed003b7a5b..725758eca18 100644 --- a/Makefile +++ b/Makefile @@ -92,13 +92,15 @@ tools/%$(EXESUF): tools/%.o tools/%.o: tools/%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $< +-include $(wildcard tools/*.d) +-include $(wildcard tests/*.d) + ffplay.o: CFLAGS += $(SDL_CFLAGS) VERSION_SH = $(SRC_PATH_BARE)/version.sh GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD -SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries -.version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak +.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak .version: M=@ version.h .version: @@ -179,7 +181,7 @@ config: # regression tests -check: test checkheaders +check: test fulltest test: codectest lavftest lavfitest seektest @@ -278,9 +280,13 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_TESTS) +fate-rsync: + rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES) else +fate-rsync: + @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite" $(FATE_TESTS): - @echo "SAMPLES not specified, cannot run FATE" + @echo "SAMPLES not specified, cannot run FATE. See doc/fate.txt for more information." endif FATE_UTILS = base64 tiny_psnr @@ -289,7 +295,7 @@ fate: $(FATE) $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @echo "TEST $(@:fate-%=%)" - $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' fate-list: @printf '%s\n' $(sort $(FATE))