RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Makefile: prevent default build rules being used on FFmpeg files 

After adding .o files to the dependencies of FFmpeg .a files make
tried to build those .o files with default rules before recursing to
the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix
incorrectly placed parentheses in the command creating the FFMPEGFILES
list. That resulted in some files being listed multiple times,
triggering warnings from the dummy rule.
This commit is contained in:
Uoti Urpala 2008-12-06 06:16:54 +02:00
parent a36945fe44
commit bc4c570ab1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -768,7 +768,7 @@ PARTS = ffmpeg/libavcodec \
libswscale \
FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(notdir $(part)).a)
FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[choS] ffmpeg/libavcodec/*/*.[choS]) ffmpeg/libavcodec/*/*.asm
FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[choS]) ffmpeg/libavcodec/*/*.[choS] ffmpeg/libavcodec/*/*.asm
@ -796,6 +796,10 @@ checkheaders: $(ALLHEADERS:.h=.ho)
dep depend: $(DEPS)
for part in $(PARTS); do $(MAKE) -C $$part depend; done
# dummy to prevent default build rules from being used for FFMPEGFILES
$(FFMPEGFILES):
echo "this shouldn't run"
$(FFMPEGLIBS): $(FFMPEGFILES) config.h
$(MAKE) -C $(@D)
touch $@