[xine-cvs] CVS: xine-lib/src/libffmpeg Makefile.am,1.43,1.44

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26273/src/libffmpeg

Modified Files:
	Makefile.am 
Log Message:
ffmpeg automagic improvements:
  - support FreeBSD port of external ffmpeg (but there is too old version
    now anyway)
  - differs postproc and avcodec, use both in Makefile (fixes bug seen in
    Gentoo)
little fix in optimize automagic:
  - properly use '$' in automagic macros


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.am	31 Oct 2005 11:54:21 -0000	1.43
+++ Makefile.am	28 Mar 2006 14:27:48 -0000	1.44
@@ -2,8 +2,9 @@
 
 if HAVE_FFMPEG
 ff_cppflags = $(FFMPEG_CPPFLAGS)
-link_ffmpeg = $(FFMPEG_LIBS)
+link_ffmpeg = $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS)
 else
+ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavutil
 link_ffmpeg = \
   $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
   $(top_builddir)/src/libffmpeg/libavutil/libavutil.la \
@@ -22,7 +23,7 @@
 
 if HAVE_DXR3
 AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \
-              $(ZLIB_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
+              $(ZLIB_CPPFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 xine_encoder.c mpeg_parser.c
 # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
@@ -30,7 +31,7 @@
 # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@
 xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
 else
-AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
+AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
 xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
                                 mpeg_parser.c
 xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@