ffmpeg: Factor out redundant sync_ipts calculation

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 5ba08fd59b2f1c0313890c56c9d0d389e6ccdbb4..f7a8bd6a4ccf5592c46d57c12c5eb52303932e18 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)
@@ -49,12 +51,12 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
 all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
 
 $(PROGS): %$(EXESUF): %_g$(EXESUF)
-       cp -p $< $@
+       $(CP) $< $@
        $(STRIP) $@
 
 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,56 +105,58 @@ 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)
-       install -d "$(BINDIR)"
-       install -c -m 755 $(PROGS) "$(BINDIR)"
+       $(Q)mkdir -p "$(BINDIR)"
+       $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
-       install -d "$(DATADIR)"
-       install -m 644 $(DATA_FILES) "$(DATADIR)"
+       $(Q)mkdir -p "$(DATADIR)"
+       $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
 install-man: $(MANPAGES)
-       install -d "$(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
 
 uninstall-progs:
-       rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
+       $(RM) $(addprefix "$(BINDIR)/", $(ALLPROGS))
 
 uninstall-data:
-       rm -rf "$(DATADIR)"
+       $(RM) -r "$(DATADIR)"
 
 uninstall-man:
-       rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
+       $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
 testclean:
-       rm -rf tests/vsynth1 tests/vsynth2 tests/data
-       rm -f $(addprefix tests/,$(CLEANSUFFIXES))
-       rm -f tests/seek_test$(EXESUF) tests/seek_test.o
-       rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
+       $(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))
 
 clean:: testclean
-       rm -f $(ALLPROGS) $(ALLPROGS_G)
-       rm -f $(CLEANSUFFIXES)
-       rm -f doc/*.html doc/*.pod doc/*.1
-       rm -f $(TOOLS)
+       $(RM) $(ALLPROGS) $(ALLPROGS_G)
+       $(RM) $(CLEANSUFFIXES)
+       $(RM) doc/*.html doc/*.pod doc/*.1
+       $(RM) $(TOOLS)
 
 distclean::
-       rm -f $(DISTCLEANSUFFIXES)
-       rm -f version.h config.* libavutil/avconfig.h
+       $(RM) $(DISTCLEANSUFFIXES)
+       $(RM) version.h config.* libavutil/avconfig.h
 
 config:
        $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)