diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:18:38 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-12 14:18:38 -0400 |
| commit | aa6b402b7a240b6f55c063b021c5c211f46ec8bd (patch) | |
| tree | a4c14e2633b549f8d2ffe3d1bef9363a4c771cb3 /src/libffmpeg | |
| parent | 67b0ebb21185cb8ea2972dead6870bab8306724e (diff) | |
| download | xine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.gz xine-lib-aa6b402b7a240b6f55c063b021c5c211f46ec8bd.tar.bz2 | |
More configure/Makefile cleanups
-- Make a pass at cleaning up contrib/ Makefile.am files
-- Rename many AM_CONDITIONALS for consistency and give them better names to
better indicate what they mean
-- Remove some dead input plugin tests
-- Clean up AM_PATH_DVDNAV
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index b2571a4ea..ab866706c 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,21 +1,19 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) -AM_LDFLAGS = $(xineplug_ldflags) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = $(ZLIB_CPPFLAGS) +AM_LDFLAGS = $(xineplug_ldflags) -if HAVE_FFMPEG -AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) +if WITH_EXTERNAL_FFMPEG +AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) - else -ff_cppflags = -I$(top_srcdir)/contrib/ffmpeg/libavutil \ +AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libavutil \ -I$(top_srcdir)/contrib/ffmpeg/libavcodec \ -I$(top_srcdir)/contrib/ffmpeg/libpostproc -link_ffmpeg = \ - $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \ - $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \ - $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a +link_ffmpeg = $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \ + $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \ + $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a: $(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a @@ -33,7 +31,7 @@ ffmpeg_config.h: $(top_builddir)/contrib/ffmpeg/config.h cp $(top_builddir)/contrib/ffmpeg/config.h ffmpeg_config.h BUILT_SOURCES = ffmpeg_config.h -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = $(BUILT_SOURCES) endif @@ -42,8 +40,9 @@ EXTRA_DIST = ffmpeg_encoder.c xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la -if HAVE_DXR3 -AM_CPPFLAGS += -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) +if ENABLE_DXR3 +AM_CFLAGS += $(X_CFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/src/dxr3 xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \ ffmpeg_encoder.c ff_mpeg_parser.c ffmpeg_decoder.h \ ff_mpeg_parser.h @@ -54,10 +53,10 @@ endif nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h -xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ $(link_ffmpeg) $(PTHREAD_LIBS) +xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) +xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c +xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libavcodec -xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c -xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) |