diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-06 06:16:54 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-06 06:21:53 +0200 |
commit | bc4c570ab1fd93db0f24759b35306a3d10985c4b (patch) | |
tree | 189fb433d90f85a59e68393dd4a88afa21aa6541 /Makefile | |
parent | a36945fe441294ad2c803dcd592325086a86816f (diff) | |
download | mpv-bc4c570ab1fd93db0f24759b35306a3d10985c4b.tar.bz2 mpv-bc4c570ab1fd93db0f24759b35306a3d10985c4b.tar.xz |
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.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 $@ |