Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Side by Side Diff: source/patched-ffmpeg-mt/Makefile

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/MAINTAINERS ('k') | source/patched-ffmpeg-mt/common.mak » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 include config.mak 1 include config.mak
2 2
3 SRC_DIR = $(SRC_PATH_BARE) 3 SRC_DIR = $(SRC_PATH_BARE)
4 4
5 vpath %.texi $(SRC_PATH_BARE) 5 vpath %.texi $(SRC_PATH_BARE)
6 6
7 PROGS-$(CONFIG_FFMPEG) += ffmpeg 7 PROGS-$(CONFIG_FFMPEG) += ffmpeg
8 PROGS-$(CONFIG_FFPLAY) += ffplay 8 PROGS-$(CONFIG_FFPLAY) += ffplay
9 PROGS-$(CONFIG_FFPROBE) += ffprobe 9 PROGS-$(CONFIG_FFPROBE) += ffprobe
10 PROGS-$(CONFIG_FFSERVER) += ffserver 10 PROGS-$(CONFIG_FFSERVER) += ffserver
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) 86 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
87 $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) 87 $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
88 88
89 tools/%$(EXESUF): tools/%.o 89 tools/%$(EXESUF): tools/%.o
90 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) 90 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
91 91
92 tools/%.o: tools/%.c 92 tools/%.o: tools/%.c
93 $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $< 93 $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
94 94
95 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS) 95 ffplay.o: CFLAGS += $(SDL_CFLAGS)
96 96
97 VERSION_SH = $(SRC_PATH_BARE)/version.sh 97 VERSION_SH = $(SRC_PATH_BARE)/version.sh
98 GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD 98 GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
99 SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries 99 SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
100 100
101 .version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak 101 .version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak
102 .version: M=@ 102 .version: M=@
103 103
104 version.h .version: 104 version.h .version:
105 $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION) 105 $(M)$(VERSION_SH) $(SRC_PATH) version.h $(EXTRA_VERSION)
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) 229 tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS)
230 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) 230 $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
231 231
232 include $(SRC_PATH_BARE)/tests/fate.mak 232 include $(SRC_PATH_BARE)/tests/fate.mak
233 include $(SRC_PATH_BARE)/tests/fate2.mak 233 include $(SRC_PATH_BARE)/tests/fate2.mak
234 234
235 include $(SRC_PATH_BARE)/tests/fate/aac.mak 235 include $(SRC_PATH_BARE)/tests/fate/aac.mak
236 include $(SRC_PATH_BARE)/tests/fate/als.mak 236 include $(SRC_PATH_BARE)/tests/fate/als.mak
237 include $(SRC_PATH_BARE)/tests/fate/fft.mak 237 include $(SRC_PATH_BARE)/tests/fate/fft.mak
238 include $(SRC_PATH_BARE)/tests/fate/h264.mak 238 include $(SRC_PATH_BARE)/tests/fate/h264.mak
239 include $(SRC_PATH_BARE)/tests/fate/mp3.mak
239 include $(SRC_PATH_BARE)/tests/fate/vorbis.mak 240 include $(SRC_PATH_BARE)/tests/fate/vorbis.mak
240 include $(SRC_PATH_BARE)/tests/fate/vp8.mak 241 include $(SRC_PATH_BARE)/tests/fate/vp8.mak
241 242
242 FATE_TESTS += $(FATE2_TESTS)
243
244 FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%) 243 FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%)
245 FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%) 244 FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
246 FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%) 245 FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
247 FATE_VCODEC = $(FATE_VSYNTH1) $(FATE_VSYNTH2) 246 FATE_VCODEC = $(FATE_VSYNTH1) $(FATE_VSYNTH2)
248 FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%) 247 FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%)
249 FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%) 248 FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%)
250 FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%) 249 FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%)
251 250
252 FATE = $(FATE_ACODEC) \ 251 FATE = $(FATE_ACODEC) \
253 $(FATE_VCODEC) \ 252 $(FATE_VCODEC) \
(...skipping 17 matching lines...) Expand all
271 fate-codec: fate-acodec fate-vcodec 270 fate-codec: fate-acodec fate-vcodec
272 fate-acodec: $(FATE_ACODEC) 271 fate-acodec: $(FATE_ACODEC)
273 fate-vcodec: $(FATE_VCODEC) 272 fate-vcodec: $(FATE_VCODEC)
274 fate-lavf: $(FATE_LAVF) 273 fate-lavf: $(FATE_LAVF)
275 fate-lavfi: $(FATE_LAVFI) 274 fate-lavfi: $(FATE_LAVFI)
276 fate-seek: $(FATE_SEEK) 275 fate-seek: $(FATE_SEEK)
277 276
278 ifdef SAMPLES 277 ifdef SAMPLES
279 FATE += $(FATE_TESTS) 278 FATE += $(FATE_TESTS)
280 else 279 else
281 fate2 $(FATE_TESTS): 280 $(FATE_TESTS):
282 @echo "SAMPLES not specified, cannot run FATE" 281 @echo "SAMPLES not specified, cannot run FATE"
283 endif 282 endif
284 283
285 FATE_UTILS = base64 tiny_psnr 284 FATE_UTILS = base64 tiny_psnr
286 285
287 fate: $(FATE) 286 fate: $(FATE)
288 fate2: $(FATE2_TESTS)
289 287
290 $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) 288 $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
291 @echo "TEST $(@:fate-%=%)" 289 @echo "TEST $(@:fate-%=%)"
292 $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TA RGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' 290 $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TA RGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
293 291
292 fate-list:
293 @printf '%s\n' $(sort $(FATE))
294
294 .PHONY: documentation *test regtest-* alltools check config 295 .PHONY: documentation *test regtest-* alltools check config
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/MAINTAINERS ('k') | source/patched-ffmpeg-mt/common.mak » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698