diff options
| -rw-r--r-- | src/libffmpeg/Makefile.am | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 7db58e33e..756b954e5 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,18 +1,15 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG -FF_CFLAGS = $(FFMPEG_CFLAGS) +FF_CPPFLAGS = $(FFMPEG_CPPFLAGS) link_ffmpeg = $(FFMPEG_LIBS) else -FF_CFLAGS = -I$(srcdir)/libavcodec -I$(srcdir)/libavcodec/libpostproc link_ffmpeg = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la -subdir_ffmpeg = libavcodec +SUBDIRS = libavcodec endif -SUBDIRS = $(subdir_ffmpeg) - # this must always be included, even if the current machine has no DXR3... EXTRA_DIST = xine_encoder.c diff_to_ffmpeg_cvs.txt @@ -23,7 +20,7 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la if HAVE_DXR3 -AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_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 @@ -31,7 +28,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module else -AM_CPPFLAGS = $(FF_CFLAGS) +AM_CPPFLAGS = $(FF_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ endif |