diff options
| author | wsnipex <wsnipex@a1.net> | 2014-02-10 07:27:52 +0100 |
|---|---|---|
| committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-02-12 12:44:04 -0700 |
| commit | 33cf3c708e8963c4fa1d5064fd948bf38c0a20f9 (patch) | |
| tree | 6765b2722645e2c12af0b5fa6f5160d5d7ce1095 /Makefile.in | |
| parent | 25ac3356285216a8d7998c4dc2026979cade71a4 (diff) | |
[make] fix ffmpeg libs target dependencies
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 428b67ccf5..6a5e0a96c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -489,14 +489,17 @@ DYNOBJSXBMC+= xbmc/freebsd/freebsd.a endif ifeq (@USE_STATIC_FFMPEG@,1) -DYNOBJSXBMC += lib/ffmpeg/libavcodec/libavcodec.a \ - lib/ffmpeg/libavfilter/libavfilter.a \ - lib/ffmpeg/libswresample/libswresample.a \ - lib/ffmpeg/libavformat/libavformat.a \ - lib/ffmpeg/libavutil/libavutil.a \ - lib/ffmpeg/libpostproc/libpostproc.a \ - lib/ffmpeg/libswscale/libswscale.a +FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \ + lib/ffmpeg/libavfilter/libavfilter.a \ + lib/ffmpeg/libswresample/libswresample.a \ + lib/ffmpeg/libavformat/libavformat.a \ + lib/ffmpeg/libavutil/libavutil.a \ + lib/ffmpeg/libpostproc/libpostproc.a \ + lib/ffmpeg/libswscale/libswscale.a +DYNOBJSXBMC+= $(FFMPEGOBJS) LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ + +$(FFMPEGOBJS): dvdpcodecs endif OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC)) @@ -535,9 +538,6 @@ else $(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MAINOBJS) -Wl,--start-group $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group -Wl,--no-undefined $(NWAOBJSXBMC) $(LIBS) endif -xbmc/main/main.a: force - $(MAKE) -C xbmc/main - xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) xbmc/main/main.a ifeq ($(findstring osx,@ARCH@), osx) |