utils.c: fix crash with threading enabled.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index afd783da5bef872fb87eff520cdb4bbd3e86d7ee..f626332482d1390c1942e130a5c459a4e0bf3564 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi $(SRC_PATH_BARE)/doc/t2h.init
        $(Q)$(TEXIDEP)
-       $(M)cd doc && texi2html -monolithic --init-file $(SRC_PATH_BARE)/doc/t2h.init $(<:doc/%=%)
+       $(M)texi2html -monolithic --init-file $(SRC_PATH_BARE)/doc/t2h.init --output $@ $<
 
 doc/%.pod: TAG = POD
 doc/%.pod: doc/%.texi
@@ -168,7 +168,7 @@ clean:: testclean
 
 distclean::
        $(RM) $(DISTCLEANSUFFIXES)
-       $(RM) version.h config.* libavutil/avconfig.h
+       $(RM) config.* .version version.h libavutil/avconfig.h
 
 config:
        $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
@@ -202,15 +202,15 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
 
 tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
        @mkdir -p tests/vsynth1
-       $(M)$(BUILD_ROOT)/$< 'tests/vsynth1/'
+       $(M)./$< 'tests/vsynth1/'
 
 tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF)
        @mkdir -p tests/vsynth2
-       $(M)$(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
+       $(M)./$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
 
 tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
        @mkdir -p tests/data
-       $(M)$(BUILD_ROOT)/$< $@
+       $(M)./$< $@
 
 tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN