diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-07 23:34:11 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-07 23:34:11 +0200 |
| commit | d6cde0db71f269b41d7d6e60bc0be838fc5be675 (patch) | |
| tree | 1343761d24d802d9db151b1fab7a75f5977aa0db /src/libffmpeg | |
| parent | ea3c402a4bffb44dd02cfe2bdeda937cbf753194 (diff) | |
| download | xine-lib-d6cde0db71f269b41d7d6e60bc0be838fc5be675.tar.gz xine-lib-d6cde0db71f269b41d7d6e60bc0be838fc5be675.tar.bz2 | |
ffmpeg_config.h is no more generated by (xine-lib's) configure, so copy it from the FFmpeg's build directory (as it's not easy to take it with relative path).
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index a1092d970..b336f600f 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -3,6 +3,12 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) + +# When using external FFmpeg, consider everything present, as it is +# outside xine's scope to handle it +ffmpeg_config.h: + echo "#define EXTERNAL_FFMPEG 1" > ffmpeg_config.h + else ff_cppflags = -I$(top_srcdir)/contrib/ffmpeg/libavutil \ -I$(top_srcdir)/contrib/ffmpeg/libavcodec \ @@ -20,10 +26,16 @@ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a: $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libpostproc/libpostproc.a + +$(top_builddir)/contrib/ffmpeg/config.h: + $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/config.mak + +ffmpeg_config.h: $(top_builddir)/contrib/ffmpeg/config.h + cp $(top_builddir)/contrib/ffmpeg/config.h ffmpeg_config.h + endif -# ffmpeg_config.h is generated by configure -DISTCLEANFILES = ffmpeg_config.h +CLEANFILES = ffmpeg_config.h # this must always be included, even if the current machine has no DXR3... EXTRA_DIST = ffmpeg_encoder.c |