summaryrefslogtreecommitdiff
path: root/src/combined/Makefile.am
AgeCommit message (Collapse)Author
2013-09-29Fix warnings in ogg/speex/theora/vorbisPetri Hintukainen
Moved plugin init function declarations to header.
2011-05-17Use "quietened" build if automake 1.11 was used.Darren Salt
2009-11-30Trim trailing space & reduce space+tab.Darren Salt
2009-01-17Merge from 1.1.Darren Salt
--HG-- rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am rename : src/libxinevdec/Makefile.am => src/video_dec/Makefile.am rename : src/libxinevdec/image.c => src/video_dec/image.c rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
2009-01-17Avoid libtool running ldconfig (where not needed) at install time.Darren Salt
2007-12-22Move libffmpeg into combined/ffmpeg directory.Diego 'Flameeyes' Pettenò
--HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_mpeg_parser.c => src/combined/ffmpeg/ff_mpeg_parser.c rename : src/libffmpeg/ff_mpeg_parser.h => src/combined/ffmpeg/ff_mpeg_parser.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.c => src/combined/ffmpeg/ffmpeg_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
2007-11-25Port nsf plugin build-disabling option to 1.2.Darren Salt
2007-06-12A nice simple merge from 1.1.Darren Salt
Hopefully, I've applied all of the $(LTLIBINTL) changes correctly...
2007-06-09Add an nsf_combined.h header file with declarations of ↵Diego 'Flameeyes' Pettenò
decoder_nsf_init_plugin and demux_nsf_init_plugin.
2007-06-01Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the ↵Diego 'Flameeyes' Pettenò
same 'xiph' plugin. As the three decoders requires Ogg support, and requires an Ogg demuxer to play, enabling any one of them will then enable the ogg demuxer. The Ogg demuxer, on its own, needs to know which of the three formats are enabled, or it will not be able to properly decode them. With this change, only one plugin will need to load and know about Xiph formats and libraries. --HG-- rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
2007-05-31Rename the flac combined plugin sources so that they are listed together in ↵Diego 'Flameeyes' Pettenò
a by-name listing. --HG-- rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
2007-05-31Rename the wavpack combined plugin sources so that their are listed together ↵Diego 'Flameeyes' Pettenò
in a by-name listing. --HG-- rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
2007-05-31Use a listing for _LTLIBRARIES similar to other Makefiles.Diego 'Flameeyes' Pettenò
2007-05-31Create a single NSF plugin that includes both the demuxer (previously in the ↵Diego 'Flameeyes' Pettenò
audio group) and the decoder. One of the two plugins without the other would be useless. --HG-- rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
2007-05-12More configure/Makefile cleanupsMatt Messier
-- 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
2007-05-11Another pass at cleaning up Makefile.am files. More to come.Matt Messier
2007-05-08RIP: AC_OPTIMIZATIONSMatt Messier
-- Removed m4/optimizations.m4, and along with it, AC_OPTIMIZATIONS. -- Stripped down, cleaned up, and merged the former together with other compiler characteristic checks. -- Do not set any optimization flags into CFLAGS. Update all Makefile.am's with proper AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, etc. to set up optimization flags, usually from DEFAULT_OCFLAGS. -- Start cleaning up CFLAGS/CPPFLAGS stuff in Makefile.am's all over the place. -- Correct a number of places where CFLAGS itself was being mangled in Makefile to on-the-fly adjust optimizations to work around compiler bugs. This stuff is now done correctly. -- The run of automake from autogen.sh is now clean of warnings. -- Cleaned out some (now) dead macros from m4/_xine.m4 -- Mac OS X intel builds out-of-the-box now -- dropped optimization on post/deinterlace/plugins/kdetv-greedyh to O1_CFLAGS. -- OBJCFLAGS is now getting set correctly everywhere that it needs to be -- Various other miscellaneous cleanups all over
2008-03-18Move ffmpeg plugin code into src/combined/ffmpeg & adapt for current ffmpeg.Darren Salt
The source remains compilable with older ffmpeg, whether internal or external. --HG-- rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_mpeg_parser.c => src/combined/ffmpeg/ff_mpeg_parser.c rename : src/libffmpeg/ff_mpeg_parser.h => src/combined/ffmpeg/ff_mpeg_parser.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_decoder.c => src/combined/ffmpeg/ffmpeg_decoder.c rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
2007-04-04Move the flac plugins sources into the combined directory, like wavpack.Diego 'Flameeyes' Pettenò
--HG-- rename : src/libflac/decoder_flac.c => src/combined/decoder_flac.c rename : src/libflac/demux_flac.c => src/combined/demux_flac.c rename : src/libflac/demux_flac.h => src/combined/demux_flac.h
2007-03-17Pass the visibility flag when building the plugin.Diego 'Flameeyes' Pettenò
CVS patchset: 8704 CVS date: 2007/03/17 16:22:38
2007-02-21Make -Wl,-z,defs an opt-in ldflag, if available. The $(xineplug_ldflags) ↵Diego 'Flameeyes' Pettenò
variable can be injected in _LDFLAGS for the xine plugins, and already provides -avoid-version -module and -Wl,-z,defs if supported. Right now only wavpack plugin actually make use of this but that can be fixed as the Makefiles are edited. CVS patchset: 8618 CVS date: 2007/02/21 23:07:45
2007-01-24Add missing include directive.Diego 'Flameeyes' Pettenò
CVS patchset: 8552 CVS date: 2007/01/24 05:04:26
2007-01-24Create a new wavpack plugin with both the old demuxer and a new decoder. To ↵Diego 'Flameeyes' Pettenò
simplify categorising, I've created a new combined directory to put plugins like wavpack (or libflac) that carries both a demuxer and a decoder in a single bundle -- I expect it being used more in the future. CVS patchset: 8551 CVS date: 2007/01/24 04:57:26