aacdec: cosmetics: (more) whitespace

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 939ebc1175f1886cbc8575bdfebc04e9751067a7..4b945f439fa49d358c2ab6322bc84ab3771f5989 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ FFLIBS := avutil
 
 DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
 
+SKIPHEADERS = cmdutils_common_opts.h
+
 include common.mak
 
 FF_LDFLAGS   := $(FFLDFLAGS)
@@ -54,7 +56,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
-               HOSTPROGS BUILT_HEADERS
+               HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS
 
 define RESET
 $(1) :=
@@ -83,7 +85,19 @@ tools/%.o: tools/%.c
 
 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
-cmdutils.o cmdutils.d: version.h
+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: M=@
+
+version.h .version:
+       $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
+       $(Q)touch .version
+
+# force version.sh to run whenever version might have changed
+-include .version
 
 alltools: $(TOOLS)
 
@@ -91,29 +105,31 @@ documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \
                                  ffplay-doc.html ffprobe-doc.html ffserver-doc.html \
                                  general.html libavfilter.html $(ALLMANPAGES))
 
+doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi
-       texi2html -monolithic -number $<
-       mv $(@F) $@
+       $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%)
 
+doc/%.pod: TAG = POD
 doc/%.pod: doc/%-doc.texi
-       doc/texi2pod.pl $< $@
+       $(M)doc/texi2pod.pl $< $@
 
+doc/%.1: TAG = MAN
 doc/%.1: doc/%.pod
-       pod2man --section=1 --center=" " --release=" " $< > $@
+       $(M)pod2man --section=1 --center=" " --release=" " $< > $@
 
 install: $(INSTALL_TARGETS-yes)
 
 install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
-       mkdir -p "$(BINDIR)"
-       install -c -m 755 $(PROGS) "$(BINDIR)"
+       $(Q)mkdir -p "$(BINDIR)"
+       $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
-       mkdir -p "$(DATADIR)"
-       install -m 644 $(DATA_FILES) "$(DATADIR)"
+       $(Q)mkdir -p "$(DATADIR)"
+       $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
 install-man: $(MANPAGES)
-       mkdir -p "$(MANDIR)/man1"
-       install -m 644 $(MANPAGES) "$(MANDIR)/man1"
+       $(Q)mkdir -p "$(MANDIR)/man1"
+       $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 uninstall: uninstall-progs uninstall-data uninstall-man
 
@@ -175,6 +191,7 @@ VCODEC_TESTS-$(call ENCDEC,MPEG2VIDEO)       += mpeg2 mpeg2thread
 VCODEC_TESTS-$(call ENCDEC,MPEG4)            += mpeg4 mpeg4adv mpeg4nr mpeg4thread error rc
 VCODEC_TESTS-$(call ENCDEC,MSMPEG4V1)        += msmpeg4
 VCODEC_TESTS-$(call ENCDEC,MSMPEG4V2)        += msmpeg4v2
+VCODEC_TESTS-$(call ENCDEC,RAWVIDEO)         += rgb yuv
 VCODEC_TESTS-$(call ENCDEC,ROQ)              += roq
 VCODEC_TESTS-$(call ENCDEC,RV10)             += rv10
 VCODEC_TESTS-$(call ENCDEC,RV20)             += rv20
@@ -234,7 +251,18 @@ LAVF_TESTS-$(call MUXDEM,VOC)                += voc
 LAVF_TESTS-$(call MUXDEM,WAV)                += wav
 LAVF_TESTS-$(call MUXDEM,YUV4MPEGPIPE)       += yuv4mpeg
 
-LAVFI_TESTS =
+LAVFI_TESTS =           \
+    crop                \
+    crop_scale          \
+    crop_scale_vflip    \
+    crop_vflip          \
+    null                \
+    scale200            \
+    scale500            \
+    vflip               \
+    vflip_crop          \
+    vflip_vflip         \
+#   lavfi_pix_fmts      \
 
 ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
 VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
@@ -245,8 +273,7 @@ CODEC_TESTS = $(VCODEC_TESTS) $(ACODEC_TESTS)
 
 codectest: $(CODEC_TESTS)
 lavftest:  $(LAVF_TESTS)
-
-# lavfitest: $(LAVFI_TESTS)
+lavfitest: $(LAVFI_TESTS)
 
 $(ACODEC_TESTS): regtest-aref
 $(VCODEC_TESTS): regtest-vref
@@ -284,7 +311,7 @@ $(LAVF_TESTS):
        @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@)
 
-$(LAVFI_TESTS):
+$(LAVFI_TESTS): tools/lavfi-showfiltfmts$(EXESUF)
        @echo "TEST LAVFI $(@:regtest-%=%)"
        @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@)
@@ -314,5 +341,16 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
 tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
+include $(SRC_PATH_BARE)/tests/fate.mak
+
+ifdef SAMPLES
+fate: $(FATE_TESTS)
+$(FATE_TESTS): ffmpeg$(EXESUF)
+       @echo "TEST FATE   $(@:fate-%=%)"
+       @$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)'
+else
+fate $(FATE_TESTS):
+       @echo "SAMPLES not specified, cannot run FATE"
+endif
 
 .PHONY: documentation *test regtest-* zlib-error alltools check config