X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=afd783da5bef872fb87eff520cdb4bbd3e86d7ee;hb=fc68a8f7030227fc4fa8d83b9051aaf598cd12dd;hp=15efd41783ae11f463b3cc5be0ea72c0aafa3de4;hpb=680aefa2fe54e8801d80f64918ada6c98f62617e;p=ffmpeg diff --git a/Makefile b/Makefile index 15efd41783a..afd783da5be 100644 --- a/Makefile +++ b/Makefile @@ -9,19 +9,18 @@ PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFSERVER) += ffserver -PROGS := $(addsuffix $(EXESUF), $(PROGS-yes)) -PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes)) -OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o -MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes))) -HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes))) -TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) -HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64) +PROGS := $(PROGS-yes:%=%$(EXESUF)) +OBJS = $(PROGS-yes:%=%.o) cmdutils.o +MANPAGES = $(PROGS-yes:%=doc/%.1) +PODPAGES = $(PROGS-yes:%=doc/%.pod) +HTMLPAGES = $(PROGS-yes:%=doc/%.html) +TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher)) +TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 +HOSTPROGS := $(TESTTOOLS:%=tests/%) BASENAMES = ffmpeg ffplay ffprobe ffserver -ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) -ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) -ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) -ALLHTMLPAGES= $(addsuffix -doc.html, $(BASENAMES)) +ALLPROGS = $(BASENAMES:%=%$(EXESUF)) +ALLMANPAGES = $(BASENAMES:%=%.1) FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter @@ -29,7 +28,6 @@ FFLIBS-$(CONFIG_AVFORMAT) += avformat FFLIBS-$(CONFIG_AVCODEC) += avcodec FFLIBS-$(CONFIG_POSTPROC) += postproc FFLIBS-$(CONFIG_SWSCALE) += swscale -FFLIBS-$(CONFIG_AVCORE) += avcore FFLIBS := avutil @@ -53,10 +51,6 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes) -$(PROGS): %$(EXESUF): %_g$(EXESUF) - $(CP) $< $@ - $(STRIP) $@ - config.h: .config .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c)) @-tput bold 2>/dev/null @@ -65,7 +59,7 @@ config.h: .config 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 TESTOBJS ARCH_HEADERS + HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS define RESET $(1) := @@ -80,25 +74,27 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) -ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) +ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) +ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) -%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) +%$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) tools/%$(EXESUF): tools/%.o $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) tools/%.o: tools/%.c - $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $< + $(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: @@ -110,21 +106,22 @@ version.h .version: alltools: $(TOOLS) -documentation: $(addprefix doc/, developer.html faq.html general.html libavfilter.html \ - $(ALLHTMLPAGES) $(ALLMANPAGES)) +DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES) + +documentation: $(DOCS) -$(HTMLPAGES) $(MANPAGES): doc/fftools-common-opts.texi +-include $(wildcard $(DOCS:%=%.d)) -doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi -doc/ffplay.pod doc/ffplay-doc.html: doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi -doc/ffprobe.pod doc/ffprobe-doc.html: doc/indevs.texi doc/protocols.texi +TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d) doc/%.html: TAG = HTML -doc/%.html: doc/%.texi - $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) +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/%=%) doc/%.pod: TAG = POD -doc/%.pod: doc/%-doc.texi +doc/%.pod: doc/%.texi + $(Q)$(TEXIDEP) $(M)doc/texi2pod.pl $< $@ doc/%.1: TAG = MAN @@ -160,20 +157,21 @@ testclean: $(RM) -r tests/vsynth1 tests/vsynth2 tests/data $(RM) $(addprefix tests/,$(CLEANSUFFIXES)) $(RM) tests/seek_test$(EXESUF) tests/seek_test.o - $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr base64)) + $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) clean:: testclean - $(RM) $(ALLPROGS) $(ALLPROGS_G) + $(RM) $(ALLPROGS) $(RM) $(CLEANSUFFIXES) $(RM) doc/*.html doc/*.pod doc/*.1 $(RM) $(TOOLS) + $(RM) $(CLEANSUFFIXES:%=tools/%) distclean:: $(RM) $(DISTCLEANSUFFIXES) $(RM) version.h config.* libavutil/avconfig.h config: - $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) + $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) # regression tests @@ -182,25 +180,18 @@ check: test checkheaders fulltest test: codectest lavftest lavfitest seektest FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref -SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref codectest: fate-codec lavftest: fate-lavf lavfitest: fate-lavfi seektest: fate-seek -AREF = tests/data/acodec.ref.wav -VREF = tests/data/vsynth1.ref.yuv +AREF = fate-acodec-aref +VREF = fate-vsynth1-vref fate-vsynth2-vref REFS = $(AREF) $(VREF) -$(REFS): TAG = GEN - $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm - $(M)$(SRC_PATH)/tests/codec-regression.sh vref vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(Q)$(SRC_PATH)/tests/codec-regression.sh vref vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw - $(M)$(SRC_PATH)/tests/codec-regression.sh aref acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @@ -254,8 +245,8 @@ FATE = $(FATE_ACODEC) \ $(FATE_LAVFI) \ $(FATE_SEEK) \ -$(FATE_ACODEC): $(AREF) -$(FATE_VCODEC): $(VREF) +$(filter-out %-aref,$(FATE_ACODEC)): $(AREF) +$(filter-out %-vref,$(FATE_VCODEC)): $(VREF) $(FATE_LAVF): $(REFS) $(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) @@ -276,7 +267,11 @@ 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" endif @@ -287,6 +282,9 @@ 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)) .PHONY: documentation *test regtest-* alltools check config