diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-14 18:45:16 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-14 18:45:16 +0200 |
| commit | c06c312002413973b227747dc62461b41c830b77 (patch) | |
| tree | d03fbda53a17b8b31ffdeab6142d3f3c07f89ba4 /src | |
| parent | 2cfbc00f7a0212f4df2bf4cfadf940213e1d4ae0 (diff) | |
| download | xine-lib-c06c312002413973b227747dc62461b41c830b77.tar.gz xine-lib-c06c312002413973b227747dc62461b41c830b77.tar.bz2 | |
Fix dependencies so that ffmpeg_config.h is built before trying to build xineplug_decode_ff.la/
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 866d05050..4938404a2 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -13,6 +13,8 @@ link_ffmpeg = \ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \ $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a +deps_ffmpeg = $(link_ffmpeg) ffmpeg_config.h + $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a: $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a @@ -50,6 +52,7 @@ xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_dec ffmpeg_config.h endif +xineplug_decode_ff_la_DEPS = $(deps_ffmpeg) xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_decode_ff_la_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS) xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ |