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 /contrib | |
| 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 'contrib')
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/libdca/Makefile.am | 15 | ||||
| -rw-r--r-- | contrib/libmpcdec/Makefile.am | 12 |
3 files changed, 14 insertions, 15 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 8433d4ce8..8ad34d968 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -7,7 +7,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ VISIBILITY_FLAG = @VISIBILITY_FLAG@ -if HAVE_DXR3 +if ENABLE_DXR3 dxr3encoder = --enable-encoder=mpeg1video endif diff --git a/contrib/libdca/Makefile.am b/contrib/libdca/Makefile.am index a118a9dc9..faab0dd14 100644 --- a/contrib/libdca/Makefile.am +++ b/contrib/libdca/Makefile.am @@ -1,17 +1,16 @@ -if DTS -if !EXTERNAL_LIBDTS +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) + +EXTRA_DIST = COPYING + +if ENABLE_DTS +if !WITH_EXTERNAL_LIBDTS noinst_LTLIBRARIES = libdca.la endif endif -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) - libdca_la_SOURCES = dca_internal.h tables.h tables_quantization.h \ tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h \ bitstream.h bitstream.c parse.c downmix.c \ include/dca.h include/dts.h - -libdca_la_CPPFLAGS = -I$(srcdir)/include libdca_la_LIBADD = -lm - -EXTRA_DIST = COPYING +libdca_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include diff --git a/contrib/libmpcdec/Makefile.am b/contrib/libmpcdec/Makefile.am index 5751239bf..24e2c0157 100644 --- a/contrib/libmpcdec/Makefile.am +++ b/contrib/libmpcdec/Makefile.am @@ -1,15 +1,15 @@ -if MUSEPACK -if !EXTERNAL_MPCDEC +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) + +EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING + +if ENABLE_MUSEPACK +if !WITH_EXTERNAL_LIBMPCDEC noinst_LTLIBRARIES = libmpcdec.la endif endif -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) - libmpcdec_la_SOURCES = huffsv46.c huffsv7.c idtag.c mpc_decoder.c mpc_reader.c \ requant.c streaminfo.c synth_filter.c \ mpcdec/internal.h mpcdec/mpcdec.h mpcdec/streaminfo.h mpcdec/math.h \ mpcdec/decoder.h mpcdec/config_types.h mpcdec/requant.h mpcdec/huffman.h \ mpcdec/reader.h - -EXTRA_DIST = diff_from_libmpcdec_1.2.5.patch COPYING |