mplayer.hg: Makefile annotate

annotate Makefile @ 31665:02d92c137407

Port GNU assembler check from FFmpeg.

author	diego
date	Tue, 13 Jul 2010 14:51:31 +0000
parents	cafeb7863de8
children	db0b49579eeb

rev	line source
27065 b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	1 # MPlayer Makefile
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	2 #
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	3 # copyright (c) 2008 Diego Biurrun
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	4 # Rewritten entirely from a set of Makefiles written by Arpi and many others.
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	5 #
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	6 # This file is part of MPlayer.
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	7 #
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	8 # MPlayer is free software; you can redistribute it and/or modify
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	9 # it under the terms of the GNU General Public License as published by
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	10 # the Free Software Foundation; either version 2 of the License, or
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	11 # (at your option) any later version.
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	12 #
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	13 # MPlayer is distributed in the hope that it will be useful,
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	16 # GNU General Public License for more details.
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	17 #
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	18 # You should have received a copy of the GNU General Public License along
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	19 # with MPlayer; if not, write to the Free Software Foundation, Inc.,
b4ff8bf4d17c Add copyright and license statement. diego parents: 27000 diff changeset	20 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1 3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	21
3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	22 include config.mak
3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	23
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	24 ###### variable declarations #######
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	25
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	26 SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	27 SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	28 SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	29 SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
26477 8c35fde6cdca Merge libvo/Makefile into top-level Makefile. diego parents: 26475 diff changeset	30 SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	31 SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	32 stream/cdinfo.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	33 SRCS_COMMON-$(CDDB) += stream/stream_cddb.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	34 SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	35 stream/stream_dvb.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	36 SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c
28256 cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	37 SRCS_COMMON-$(DVDNAV_INTERNAL) += libdvdnav/dvdnav.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	38 libdvdnav/highlight.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	39 libdvdnav/navigation.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	40 libdvdnav/read_cache.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	41 libdvdnav/remap.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	42 libdvdnav/searching.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	43 libdvdnav/settings.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	44 libdvdnav/vm/decoder.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	45 libdvdnav/vm/vm.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	46 libdvdnav/vm/vmcmd.c \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	47
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	48 SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	49 stream/stream_dvd_common.c
28245 83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	50 SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread4/bitreader.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	51 libdvdread4/dvd_input.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	52 libdvdread4/dvd_reader.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	53 libdvdread4/dvd_udf.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	54 libdvdread4/ifo_print.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	55 libdvdread4/ifo_read.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	56 libdvdread4/md5.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	57 libdvdread4/nav_print.c \
83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	58 libdvdread4/nav_read.c \
26496 99320e745ef3 Merge dvdread/Makefile into top-level Makefile. diego parents: 26494 diff changeset	59
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	60 SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	61 SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	62 libfaad2/cfft.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	63 libfaad2/common.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	64 libfaad2/decoder.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	65 libfaad2/drc.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	66 libfaad2/drm_dec.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	67 libfaad2/error.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	68 libfaad2/filtbank.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	69 libfaad2/hcr.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	70 libfaad2/huffman.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	71 libfaad2/ic_predict.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	72 libfaad2/is.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	73 libfaad2/lt_predict.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	74 libfaad2/mdct.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	75 libfaad2/mp4.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	76 libfaad2/ms.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	77 libfaad2/output.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	78 libfaad2/pns.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	79 libfaad2/ps_dec.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	80 libfaad2/ps_syntax.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	81 libfaad2/pulse.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	82 libfaad2/rvlc.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	83 libfaad2/sbr_dct.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	84 libfaad2/sbr_dec.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	85 libfaad2/sbr_e_nf.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	86 libfaad2/sbr_fbt.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	87 libfaad2/sbr_hfadj.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	88 libfaad2/sbr_hfgen.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	89 libfaad2/sbr_huff.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	90 libfaad2/sbr_qmf.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	91 libfaad2/sbr_syntax.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	92 libfaad2/sbr_tf_grid.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	93 libfaad2/specrec.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	94 libfaad2/ssr.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	95 libfaad2/ssr_fb.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	96 libfaad2/ssr_ipqf.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	97 libfaad2/syntax.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	98 libfaad2/tns.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	99
28448 b644796edd94 Conditionally compile aclib.c instead of placing #ifdef around its content. diego parents: 28429 diff changeset	100 SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.c
26477 8c35fde6cdca Merge libvo/Makefile into top-level Makefile. diego parents: 26475 diff changeset	101 SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	102 SRCS_COMMON-$(FTP) += stream/stream_ftp.c
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	103 SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	104 SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
27400 6d5006b64892 Merge two redundantly declared lines into one. diego parents: 27399 diff changeset	105 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	106 SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
26344 3278dca99929 Merge libaf/Makefile into Makefile, one less instance of recursive make. diego parents: 26331 diff changeset	107 SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
30238 faed63286179 Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication, reimar parents: 30200 diff changeset	108 SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
30024 b7b76236691d Experimental support for external libass. reimar parents: 30022 diff changeset	109 SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
b7b76236691d Experimental support for external libass. reimar parents: 30022 diff changeset	110 libass/ass_mp.c \
b7b76236691d Experimental support for external libass. reimar parents: 30022 diff changeset	111
b7b76236691d Experimental support for external libass. reimar parents: 30022 diff changeset	112 SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \
26347 1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	113 libass/ass_bitmap.c \
1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	114 libass/ass_cache.c \
30200 48d020c5ceca Update internal libass copy to commit 8db4a5 greg parents: 30174 diff changeset	115 libass/ass_drawing.c \
26347 1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	116 libass/ass_font.c \
1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	117 libass/ass_fontconfig.c \
1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	118 libass/ass_library.c \
30200 48d020c5ceca Update internal libass copy to commit 8db4a5 greg parents: 30174 diff changeset	119 libass/ass_parse.c \
26347 1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	120 libass/ass_render.c \
30200 48d020c5ceca Update internal libass copy to commit 8db4a5 greg parents: 30174 diff changeset	121 libass/ass_strtod.c \
26347 1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	122 libass/ass_utils.c \
1e6b8666f96f 10l: libass compilation should be conditional. diego parents: 26344 diff changeset	123
26691 e456af9908f8 AVOptions support. michael parents: 26682 diff changeset	124 SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \
31599 cafeb7863de8 Add support for PGS subtitle decoding via libavcodec. reimar parents: 31591 diff changeset	125 av_sub.c \
26691 e456af9908f8 AVOptions support. michael parents: 26682 diff changeset	126 libaf/af_lavcresample.c \
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	127 libmpcodecs/ad_ffmpeg.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	128 libmpcodecs/vd_ffmpeg.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	129 libmpcodecs/vf_lavc.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	130 libmpcodecs/vf_lavcdeint.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	131 libmpcodecs/vf_screenshot.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	132
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	133 # These filters use private headers and do not work with shared libavcodec.
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	134 SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	135 libmpcodecs/vf_fspp.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	136 libmpcodecs/vf_geq.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	137 libmpcodecs/vf_mcdeint.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	138 libmpcodecs/vf_qp.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	139 libmpcodecs/vf_spp.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	140 libmpcodecs/vf_uspp.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	141
29881 5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions. reimar parents: 29809 diff changeset	142 SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c \
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions. reimar parents: 29809 diff changeset	143 stream/stream_ffmpeg.c \
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions. reimar parents: 29809 diff changeset	144
31565 9a590e7aac57 Support for unencrypted Blu-ray playback through libbluray. ben parents: 31564 diff changeset	145 SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c
29093 9d220a44caae Add libbs2b audio filter itself. bircoph parents: 29086 diff changeset	146 SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	147 SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	148 SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	149 libmpcodecs/vd_libdv.c \
d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	150 libmpdemux/demux_rawdv.c
26493 872363c4aafd Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL. diego parents: 26492 diff changeset	151 SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
26492 474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	152 libdvdcss/device.c \
474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	153 libdvdcss/error.c \
474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	154 libdvdcss/ioctl.c \
474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	155 libdvdcss/libdvdcss.c \
474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	156
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	157 SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	158
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	159 SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c
545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	160 SRCS_LIBMPEG2-INTERNAL-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	161 libmpeg2/motion_comp_alpha.c
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	162 SRCS_LIBMPEG2-INTERNAL-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	163 libmpeg2/motion_comp_arm_s.S
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	164 SRCS_LIBMPEG2-INTERNAL-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	165 libmpeg2/motion_comp_altivec.c
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	166 SRCS_LIBMPEG2-INTERNAL-$(HAVE_MMX) += libmpeg2/idct_mmx.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	167 libmpeg2/motion_comp_mmx.c
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	168 SRCS_LIBMPEG2-INTERNAL-$(HAVE_VIS) += libmpeg2/motion_comp_vis.c
545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	169 SRCS_COMMON-$(LIBMPEG2_INTERNAL) += libmpeg2/alloc.c \
26519 04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	170 libmpeg2/cpu_accel.c\
04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	171 libmpeg2/cpu_state.c \
04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	172 libmpeg2/decode.c \
04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	173 libmpeg2/header.c \
04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	174 libmpeg2/idct.c \
04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	175 libmpeg2/motion_comp.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	176 libmpeg2/slice.c \
31286 545edc88a102 Split internal and external libmpeg2 support in the build system. diego parents: 31284 diff changeset	177 $(SRCS_LIBMPEG2-INTERNAL-yes)
29166 c158da9c4018 whitespace cosmetics diego parents: 29165 diff changeset	178
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	179 SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	180 stream/stream_nemesi.c
d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	181 SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	182 SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	183 SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	184 SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	185 SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	186 libmpdemux/demux_rtp_codec.cpp \
27401 9a33b25486a2 10l: Remove stray backslash at end of line. diego parents: 27400 diff changeset	187 stream/stream_live555.c
27394 a0c602e0caf3 Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER. diego parents: 27373 diff changeset	188 SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
28018 4ac70bd6acac MNG demuxer by Stefan Schuermans, stefan blinkenarea org diego parents: 27906 diff changeset	189 SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
31524 083786e4aaf2 MP3 decoding through libmpg123 diego parents: 31511 diff changeset	190 SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
29166 c158da9c4018 whitespace cosmetics diego parents: 29165 diff changeset	191
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	192 SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	193 mp3lib/dct64_3dnow.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	194 SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	195 mp3lib/dct64_k7.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	196 SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	197 SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	198 $(SRCS_MP3LIB-X86-yes)
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	199 SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	200 SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	201 SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
30486 51db2b34b91c Fix linking of mp3lib test programs when internal mp3lib is disabled. diego parents: 30485 diff changeset	202 SRCS_MP3LIB += mp3lib/sr1.c \
29165 55181c28943d Use temporary variables to add objects that depend on more than one diego parents: 29163 diff changeset	203 $(SRCS_MP3LIB-yes)
30486 51db2b34b91c Fix linking of mp3lib test programs when internal mp3lib is disabled. diego parents: 30485 diff changeset	204 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \
51db2b34b91c Fix linking of mp3lib test programs when internal mp3lib is disabled. diego parents: 30485 diff changeset	205 $(SRCS_MP3LIB)
29166 c158da9c4018 whitespace cosmetics diego parents: 29165 diff changeset	206
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	207 SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	208 libmpdemux/demux_mpc.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	209 SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	210 stream/freesdp/common.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	211 stream/freesdp/errorlist.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	212 stream/freesdp/parser.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	213 stream/librtsp/rtsp.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	214 stream/librtsp/rtsp_rtp.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	215 stream/librtsp/rtsp_session.c \
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	216
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	217 SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	218 SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	219 SRCS_COMMON-$(NEED_MMAP) += osdep/mmap-os2.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	220 SRCS_COMMON-$(NEED_SETENV) += osdep/setenv.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	221 SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	222 SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	223 SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	224 SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
27397 d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and diego parents: 27394 diff changeset	225 SRCS_COMMON-$(NETWORK) += stream/stream_netstream.c \
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	226 stream/asf_mmst_streaming.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	227 stream/asf_streaming.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	228 stream/cookies.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	229 stream/http.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	230 stream/network.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	231 stream/pnm.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	232 stream/rtp.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	233 stream/udp.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	234 stream/tcp.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	235 stream/stream_rtp.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	236 stream/stream_udp.c \
26601 590710d64e84 realrtsp depends on librtsp/rtsp.c reimar parents: 26600 diff changeset	237 stream/librtsp/rtsp.c \
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	238 stream/realrtsp/asmrp.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	239 stream/realrtsp/real.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	240 stream/realrtsp/rmff.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	241 stream/realrtsp/sdpplin.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	242 stream/realrtsp/xbuffer.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	243
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	244 SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c
28485 3f597aacbb69 Add priority support for OS/2 and factorize the Windows priority support. diego parents: 28448 diff changeset	245 SRCS_COMMON-$(PRIORITY) += osdep/priority.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	246 SRCS_COMMON-$(PVR) += stream/stream_pvr.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	247 SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	248 libmpcodecs/vd_qtvideo.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	249 SRCS_COMMON-$(RADIO) += stream/stream_radio.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	250 SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	251 SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	252 libmpcodecs/vd_realvid.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	253 SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	254 SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	255
26471 f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	256 SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	257 tremor/block.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	258 tremor/codebook.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	259 tremor/floor0.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	260 tremor/floor1.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	261 tremor/framing.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	262 tremor/info.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	263 tremor/mapping0.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	264 tremor/mdct.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	265 tremor/registry.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	266 tremor/res012.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	267 tremor/sharedbook.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	268 tremor/synthesis.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	269 tremor/window.c \
f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	270
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	271 SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	272 stream/frequencies.c stream/tvi_dummy.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	273 SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c
29943 1752ec1e845a DShow TV input needs part of the our DirectShow code, so add the proper reimar parents: 29881 diff changeset	274 SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c \
1752ec1e845a DShow TV input needs part of the our DirectShow code, so add the proper reimar parents: 29881 diff changeset	275 loader/dshow/guids.c \
1752ec1e845a DShow TV input needs part of the our DirectShow code, so add the proper reimar parents: 29881 diff changeset	276 loader/dshow/mediatype.c \
1752ec1e845a DShow TV input needs part of the our DirectShow code, so add the proper reimar parents: 29881 diff changeset	277
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	278 SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	279 SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
26330 230361fe83eb cosmetics: Align columns. diego parents: 26324 diff changeset	280 SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	281 SRCS_COMMON-$(VCD) += stream/stream_vcd.c
29323 b2492a568a50 Rename LIBVORBIS Makefile variable to VORBIS. diego parents: 29276 diff changeset	282 SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \
b2492a568a50 Rename LIBVORBIS Makefile variable to VORBIS. diego parents: 29276 diff changeset	283 libmpdemux/demux_ogg.c
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	284 SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c
30500 78a2c26a1002 Fix linking of loader test programs when loader is disabled. diego parents: 30486 diff changeset	285 SRCS_QTX_EMULATION += loader/wrapper.S
78a2c26a1002 Fix linking of loader test programs when loader is disabled. diego parents: 30486 diff changeset	286 SRCS_COMMON-$(QTX_EMULATION) += $(SRCS_QTX_EMULATION)
78a2c26a1002 Fix linking of loader test programs when loader is disabled. diego parents: 30486 diff changeset	287 SRCS_WIN32_EMULATION += loader/elfdll.c \
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	288 loader/ext.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	289 loader/ldt_keeper.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	290 loader/module.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	291 loader/pe_image.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	292 loader/pe_resource.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	293 loader/registry.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	294 loader/resource.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	295 loader/win32.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	296
30500 78a2c26a1002 Fix linking of loader test programs when loader is disabled. diego parents: 30486 diff changeset	297 SRCS_COMMON-$(WIN32_EMULATION) += $(SRCS_WIN32_EMULATION)
78a2c26a1002 Fix linking of loader test programs when loader is disabled. diego parents: 30486 diff changeset	298
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	299 SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	300 libmpcodecs/ad_dmo.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	301 libmpcodecs/ad_dshow.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	302 libmpcodecs/ad_twin.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	303 libmpcodecs/vd_dmo.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	304 libmpcodecs/vd_dshow.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	305 libmpcodecs/vd_vfw.c \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	306 libmpcodecs/vd_vfwex.c \
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	307 libmpdemux/demux_avs.c \
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	308 loader/afl.c \
26999 0b21ffa03b9c Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can diego parents: 26998 diff changeset	309 loader/drv.c \
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	310 loader/vfl.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	311 loader/dshow/DS_AudioDecoder.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	312 loader/dshow/DS_Filter.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	313 loader/dshow/DS_VideoDecoder.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	314 loader/dshow/allocator.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	315 loader/dshow/cmediasample.c \
30824 c121d03db8b9 Implement DirectShow filter graph. sesse parents: 30807 diff changeset	316 loader/dshow/graph.c \
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	317 loader/dshow/guids.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	318 loader/dshow/inputpin.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	319 loader/dshow/mediatype.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	320 loader/dshow/outputpin.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	321 loader/dmo/DMO_AudioDecoder.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	322 loader/dmo/DMO_VideoDecoder.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	323 loader/dmo/buffer.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	324 loader/dmo/dmo.c \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	325 loader/dmo/dmo_guids.c \
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	326
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	327 SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	328 SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	329 SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c
31334 7ab74cfbcabe Revert linking vd_zrmjpeg.c and vf_zrmjpeg.c to MPlayer only. diego parents: 31311 diff changeset	330 SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \
7ab74cfbcabe Revert linking vd_zrmjpeg.c and vf_zrmjpeg.c to MPlayer only. diego parents: 31311 diff changeset	331 libmpcodecs/vf_zrmjpeg.c
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	332 SRCS_COMMON = asxparser.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	333 codec-cfg.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	334 cpudetect.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	335 edl.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	336 find_sub.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	337 fmt-conversion.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	338 m_config.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	339 m_option.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	340 m_struct.c \
31311 9ce59b78dbfd Remove mp_msg related GUI hacks. reimar parents: 31295 diff changeset	341 mp_msg.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	342 mpcommon.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	343 parser-cfg.c \
30901 76a13038105e Rename get_path.[ch] --> path.[ch]. diego parents: 30900 diff changeset	344 path.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	345 playtree.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	346 playtreeparser.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	347 spudec.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	348 sub_cc.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	349 subopt-helper.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	350 subreader.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	351 vobsub.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	352 libaf/af.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	353 libaf/af_center.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	354 libaf/af_channels.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	355 libaf/af_comp.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	356 libaf/af_delay.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	357 libaf/af_dummy.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	358 libaf/af_equalizer.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	359 libaf/af_extrastereo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	360 libaf/af_format.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	361 libaf/af_gate.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	362 libaf/af_hrtf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	363 libaf/af_karaoke.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	364 libaf/af_pan.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	365 libaf/af_resample.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	366 libaf/af_scaletempo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	367 libaf/af_sinesuppress.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	368 libaf/af_stats.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	369 libaf/af_sub.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	370 libaf/af_surround.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	371 libaf/af_sweep.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	372 libaf/af_tools.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	373 libaf/af_volnorm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	374 libaf/af_volume.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	375 libaf/filter.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	376 libaf/format.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	377 libaf/reorder_ch.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	378 libaf/window.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	379 libmpcodecs/ad.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	380 libmpcodecs/ad_alaw.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	381 libmpcodecs/ad_dk3adpcm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	382 libmpcodecs/ad_dvdpcm.c \
30238 faed63286179 Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication, reimar parents: 30200 diff changeset	383 libmpcodecs/ad_hwac3.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	384 libmpcodecs/ad_hwmpa.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	385 libmpcodecs/ad_imaadpcm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	386 libmpcodecs/ad_msadpcm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	387 libmpcodecs/ad_pcm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	388 libmpcodecs/dec_audio.c \
29809 e255f9571156 Remove CONFIG_TV_TELETEXT. cehoyos parents: 29759 diff changeset	389 libmpcodecs/dec_teletext.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	390 libmpcodecs/dec_video.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	391 libmpcodecs/img_format.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	392 libmpcodecs/mp_image.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	393 libmpcodecs/pullup.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	394 libmpcodecs/vd.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	395 libmpcodecs/vd_hmblck.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	396 libmpcodecs/vd_lzo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	397 libmpcodecs/vd_mpegpes.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	398 libmpcodecs/vd_mtga.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	399 libmpcodecs/vd_null.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	400 libmpcodecs/vd_raw.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	401 libmpcodecs/vd_sgi.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	402 libmpcodecs/vf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	403 libmpcodecs/vf_1bpp.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	404 libmpcodecs/vf_2xsai.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	405 libmpcodecs/vf_blackframe.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	406 libmpcodecs/vf_boxblur.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	407 libmpcodecs/vf_crop.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	408 libmpcodecs/vf_cropdetect.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	409 libmpcodecs/vf_decimate.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	410 libmpcodecs/vf_delogo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	411 libmpcodecs/vf_denoise3d.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	412 libmpcodecs/vf_detc.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	413 libmpcodecs/vf_dint.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	414 libmpcodecs/vf_divtc.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	415 libmpcodecs/vf_down3dright.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	416 libmpcodecs/vf_dsize.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	417 libmpcodecs/vf_dvbscale.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	418 libmpcodecs/vf_eq.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	419 libmpcodecs/vf_eq2.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	420 libmpcodecs/vf_expand.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	421 libmpcodecs/vf_field.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	422 libmpcodecs/vf_fil.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	423 libmpcodecs/vf_filmdint.c \
30807 82dd2fbdb772 Enable ASS/SSA subtitle support in mencoder greg parents: 30683 diff changeset	424 libmpcodecs/vf_fixpts.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	425 libmpcodecs/vf_flip.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	426 libmpcodecs/vf_format.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	427 libmpcodecs/vf_framestep.c \
29371 3fa15eca924e new debanding filter lorenm parents: 29323 diff changeset	428 libmpcodecs/vf_gradfun.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	429 libmpcodecs/vf_halfpack.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	430 libmpcodecs/vf_harddup.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	431 libmpcodecs/vf_hqdn3d.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	432 libmpcodecs/vf_hue.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	433 libmpcodecs/vf_il.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	434 libmpcodecs/vf_ilpack.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	435 libmpcodecs/vf_ivtc.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	436 libmpcodecs/vf_kerndeint.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	437 libmpcodecs/vf_mirror.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	438 libmpcodecs/vf_noformat.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	439 libmpcodecs/vf_noise.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	440 libmpcodecs/vf_ow.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	441 libmpcodecs/vf_palette.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	442 libmpcodecs/vf_perspective.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	443 libmpcodecs/vf_phase.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	444 libmpcodecs/vf_pp7.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	445 libmpcodecs/vf_pullup.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	446 libmpcodecs/vf_rectangle.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	447 libmpcodecs/vf_remove_logo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	448 libmpcodecs/vf_rgbtest.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	449 libmpcodecs/vf_rotate.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	450 libmpcodecs/vf_sab.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	451 libmpcodecs/vf_scale.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	452 libmpcodecs/vf_smartblur.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	453 libmpcodecs/vf_softpulldown.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	454 libmpcodecs/vf_softskip.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	455 libmpcodecs/vf_swapuv.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	456 libmpcodecs/vf_telecine.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	457 libmpcodecs/vf_test.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	458 libmpcodecs/vf_tfields.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	459 libmpcodecs/vf_tile.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	460 libmpcodecs/vf_tinterlace.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	461 libmpcodecs/vf_unsharp.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	462 libmpcodecs/vf_vo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	463 libmpcodecs/vf_yadif.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	464 libmpcodecs/vf_yuvcsp.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	465 libmpcodecs/vf_yvu9.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	466 libmpdemux/aac_hdr.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	467 libmpdemux/asfheader.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	468 libmpdemux/aviheader.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	469 libmpdemux/aviprint.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	470 libmpdemux/demuxer.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	471 libmpdemux/demux_aac.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	472 libmpdemux/demux_asf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	473 libmpdemux/demux_audio.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	474 libmpdemux/demux_avi.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	475 libmpdemux/demux_demuxers.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	476 libmpdemux/demux_film.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	477 libmpdemux/demux_fli.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	478 libmpdemux/demux_lmlm4.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	479 libmpdemux/demux_mf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	480 libmpdemux/demux_mkv.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	481 libmpdemux/demux_mov.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	482 libmpdemux/demux_mpg.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	483 libmpdemux/demux_nsv.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	484 libmpdemux/demux_pva.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	485 libmpdemux/demux_rawaudio.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	486 libmpdemux/demux_rawvideo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	487 libmpdemux/demux_realaud.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	488 libmpdemux/demux_real.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	489 libmpdemux/demux_roq.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	490 libmpdemux/demux_smjpeg.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	491 libmpdemux/demux_ts.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	492 libmpdemux/demux_ty.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	493 libmpdemux/demux_ty_osd.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	494 libmpdemux/demux_viv.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	495 libmpdemux/demux_vqf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	496 libmpdemux/demux_y4m.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	497 libmpdemux/ebml.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	498 libmpdemux/extension.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	499 libmpdemux/mf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	500 libmpdemux/mp3_hdr.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	501 libmpdemux/mp_taglists.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	502 libmpdemux/mpeg_hdr.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	503 libmpdemux/mpeg_packetizer.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	504 libmpdemux/parse_es.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	505 libmpdemux/parse_mp4.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	506 libmpdemux/video.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	507 libmpdemux/yuv4mpeg.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	508 libmpdemux/yuv4mpeg_ratio.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	509 libvo/osd.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	510 libvo/sub.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	511 osdep/$(GETCH) \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	512 osdep/$(TIMER) \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	513 stream/open.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	514 stream/stream.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	515 stream/stream_cue.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	516 stream/stream_file.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	517 stream/stream_mf.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	518 stream/stream_null.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	519 stream/url.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	520 $(SRCS_COMMON-yes)
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	521
26308 51338bf153de Get rid of recursive make for the input/ subdirectory. diego parents: 26305 diff changeset	522
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	523 SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	524 SRCS_MPLAYER-$(AA) += libvo/vo_aa.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	525 SRCS_MPLAYER-$(ALSA1X) += libao2/ao_alsa.c
211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	526 SRCS_MPLAYER-$(ALSA5) += libao2/ao_alsa5.c
211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	527 SRCS_MPLAYER-$(ALSA9) += libao2/ao_alsa.c
26773 7763b34ba58e Sort alphabetically ben parents: 26772 diff changeset	528 SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c
26308 51338bf153de Get rid of recursive make for the input/ subdirectory. diego parents: 26305 diff changeset	529 SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	530 SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	531 SRCS_MPLAYER-$(BL) += libvo/vo_bl.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	532 SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
29209 631aac106b7a Rename macosx audio output driver to coreaudio. diego parents: 29167 diff changeset	533 SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
29533 9c8f8e375823 Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer reimar parents: 29531 diff changeset	534 SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m libvo/osx_common.c
28740 1f76d86e49ae DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net diego parents: 28737 diff changeset	535 SRCS_MPLAYER-$(DART) += libao2/ao_dart.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	536 SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	537 SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	538 SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	539 SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	540 SRCS_MPLAYER-$(DIRECTX) += libao2/ao_dsound.c libvo/vo_directx.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	541 SRCS_MPLAYER-$(DXR2) += libao2/ao_dxr2.c libvo/vo_dxr2.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	542 SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	543 SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	544 SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	545 SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	546 SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c
30921 83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	547 SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \
83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	548 libvo/vo_gl2.c libvo/csputils.c
31032 362425fe3de8 Add sdl_common file and use it to share the input handling between -vo gl reimar parents: 30984 diff changeset	549 SRCS_MPLAYER-$(GL_SDL) += libvo/sdl_common.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	550 SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c
30022 d6a9eeff0125 Add x11_common as dependency for OpenGL with X11 backend. reimar parents: 29943 diff changeset	551 SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c
30140 12a49e9ca30e Finally add matrixview vo. reimar parents: 30108 diff changeset	552 SRCS_MPLAYER-$(MATRIXVIEW) += libvo/vo_matrixview.c libvo/matrixview.c
26785 a3eb683ccb2e Introduce make variable common to the GTK and Windows GUI and use it diego parents: 26784 diff changeset	553 SRCS_MPLAYER-$(GUI) += gui/bitmap.c
26366 cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	554 SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	555 gui/cfg.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	556 gui/interface.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	557 gui/mplayer/gui_common.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	558 gui/mplayer/menu.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	559 gui/mplayer/mw.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	560 gui/mplayer/pb.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	561 gui/mplayer/play.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	562 gui/mplayer/sw.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	563 gui/mplayer/widgets.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	564 gui/mplayer/gtk/about.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	565 gui/mplayer/gtk/eq.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	566 gui/mplayer/gtk/fs.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	567 gui/mplayer/gtk/gtk_common.c \
30531 704903d34069 Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch]. diego parents: 30507 diff changeset	568 gui/mplayer/gtk/gtk_menu.c \
26366 cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	569 gui/mplayer/gtk/gtk_url.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	570 gui/mplayer/gtk/mb.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	571 gui/mplayer/gtk/opts.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	572 gui/mplayer/gtk/pl.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	573 gui/mplayer/gtk/sb.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	574 gui/skin/cut.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	575 gui/skin/font.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	576 gui/skin/skin.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	577 gui/wm/ws.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	578 gui/wm/wsxdnd.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	579
26785 a3eb683ccb2e Introduce make variable common to the GTK and Windows GUI and use it diego parents: 26784 diff changeset	580 SRCS_MPLAYER-$(GUI_WIN32) += gui/win32/dialogs.c \
26366 cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	581 gui/win32/gui.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	582 gui/win32/interface.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	583 gui/win32/playlist.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	584 gui/win32/preferences.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	585 gui/win32/skinload.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	586 gui/win32/widgetrender.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	587 gui/win32/wincfg.c \
cc260b44c154 Merge ./gui/Makefile into ./Makefile, one less instance of recursive make. diego parents: 26359 diff changeset	588
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	589 SRCS_MPLAYER-$(IVTV) += libao2/ao_ivtv.c libvo/vo_ivtv.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	590 SRCS_MPLAYER-$(JACK) += libao2/ao_jack.c
26308 51338bf153de Get rid of recursive make for the input/ subdirectory. diego parents: 26305 diff changeset	591 SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	592 SRCS_MPLAYER-$(JPEG) += libvo/vo_jpeg.c
30439 2118e8876a2b Add OS/2 KAI audio driver support komh parents: 30238 diff changeset	593 SRCS_MPLAYER-$(KAI) += libao2/ao_kai.c
28915 c2baa796c5e5 KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net diego parents: 28910 diff changeset	594 SRCS_MPLAYER-$(KVA) += libvo/vo_kva.c
30145 def3818d93c3 100l, vo_png must go in SRCS_MPLAYER, not SRCS_COMMON. reimar parents: 30144 diff changeset	595 SRCS_MPLAYER-$(LIBAVCODEC) += libvo/vo_png.c
26359 4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	596 SRCS_MPLAYER-$(LIBMENU) += libmenu/menu.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	597 libmenu/menu_chapsel.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	598 libmenu/menu_cmdlist.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	599 libmenu/menu_console.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	600 libmenu/menu_filesel.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	601 libmenu/menu_list.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	602 libmenu/menu_param.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	603 libmenu/menu_pt.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	604 libmenu/menu_txt.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	605 libmenu/vf_menu.c \
4a9b26db833e Ahem, libmenu objects should only be compiled when OSD menu is enabled. diego parents: 26351 diff changeset	606
26402 08117784bc9e Add Makefile variable for DVB OSD menu, saves one ifeq. diego parents: 26399 diff changeset	607 SRCS_MPLAYER-$(LIBMENU_DVBIN) += libmenu/menu_dvbin.c
26586 4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	608 SRCS_MPLAYER-$(LIRC) += input/lirc.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	609 SRCS_MPLAYER-$(MD5SUM) += libvo/vo_md5sum.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	610 SRCS_MPLAYER-$(MGA) += libvo/vo_mga.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	611 SRCS_MPLAYER-$(NAS) += libao2/ao_nas.c
211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	612 SRCS_MPLAYER-$(OPENAL) += libao2/ao_openal.c
211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	613 SRCS_MPLAYER-$(OSS) += libao2/ao_oss.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	614 SRCS_MPLAYER-$(PNM) += libvo/vo_pnm.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	615 SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c
29531 6bd4c0c77eab Add osx_common.c and move the keycode conversion (OSX to MPlayer) there. reimar parents: 29371 diff changeset	616 SRCS_MPLAYER-$(QUARTZ) += libvo/vo_quartz.c libvo/osx_common.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	617 SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
31032 362425fe3de8 Add sdl_common file and use it to share the input handling between -vo gl reimar parents: 30984 diff changeset	618 SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	619 SRCS_MPLAYER-$(SGIAUDIO) += libao2/ao_sgi.c
211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	620 SRCS_MPLAYER-$(SUNAUDIO) += libao2/ao_sun.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	621 SRCS_MPLAYER-$(SVGA) += libvo/vo_svga.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	622 SRCS_MPLAYER-$(TDFXFB) += libvo/vo_tdfxfb.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	623 SRCS_MPLAYER-$(TDFXVID) += libvo/vo_tdfx_vid.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	624 SRCS_MPLAYER-$(TGA) += libvo/vo_tga.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	625 SRCS_MPLAYER-$(V4L2) += libvo/vo_v4l2.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	626 SRCS_MPLAYER-$(V4L2) += libao2/ao_v4l2.c
28582 4d64f83e2fac Add support for VDPAU video out, including hardware decoding. reimar parents: 28526 diff changeset	627 SRCS_MPLAYER-$(VDPAU) += libvo/vo_vdpau.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	628 SRCS_MPLAYER-$(VESA) += libvo/gtf.c libvo/vo_vesa.c libvo/vesa_lvo.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	629 SRCS_MPLAYER-$(VIDIX) += libvo/vo_cvidix.c \
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	630 libvo/vosub_vidix.c \
27080 724a953b5179 renamed vidixlib.c to vidix.c ben parents: 27071 diff changeset	631 vidix/vidix.c \
26516 7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	632 vidix/drivers.c \
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	633 vidix/dha.c \
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	634 vidix/mtrr.c \
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	635 vidix/pci.c \
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	636 vidix/pci_names.c \
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	637 vidix/pci_dev_ids.c\
7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	638
26586 4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	639 SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += vidix/cyberblade_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	640 SRCS_MPLAYER-$(VIDIX_IVTV) += vidix/ivtv_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	641 SRCS_MPLAYER-$(VIDIX_MACH64) += vidix/mach64_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	642 SRCS_MPLAYER-$(VIDIX_MGA) += vidix/mga_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	643 SRCS_MPLAYER-$(VIDIX_MGA_CRTC2) += vidix/mga_crtc2_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	644 SRCS_MPLAYER-$(VIDIX_NVIDIA) += vidix/nvidia_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	645 SRCS_MPLAYER-$(VIDIX_PM2) += vidix/pm2_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	646 SRCS_MPLAYER-$(VIDIX_PM3) += vidix/pm3_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	647 SRCS_MPLAYER-$(VIDIX_RADEON) += vidix/radeon_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	648 SRCS_MPLAYER-$(VIDIX_RAGE128) += vidix/rage128_vid.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	649 SRCS_MPLAYER-$(VIDIX_S3) += vidix/s3_vid.c
27420 917c93c652b0 Add VIDIX driver for SuperH Mobile VEU hardware block. ben parents: 27411 diff changeset	650 SRCS_MPLAYER-$(VIDIX_SH_VEU) += vidix/sh_veu_vid.c
26586 4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	651 SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c
4f76dfed8209 whitespace cosmetics diego parents: 26585 diff changeset	652 SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	653 SRCS_MPLAYER-$(WII) += libvo/vo_wii.c
28041 211c23dac000 Treat audio output objects the same as everything else in the build system, diego parents: 28018 diff changeset	654 SRCS_MPLAYER-$(WIN32WAVEOUT) += libao2/ao_win32.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	655 SRCS_MPLAYER-$(WINVIDIX) += libvo/vo_winvidix.c
30921 83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	656 SRCS_MPLAYER-$(X11) += libvo/vo_x11.c libvo/vo_xover.c \
83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	657 libvo/x11_common.c
28046 7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	658 SRCS_MPLAYER-$(XMGA) += libvo/vo_xmga.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	659 SRCS_MPLAYER-$(XV) += libvo/vo_xv.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	660 SRCS_MPLAYER-$(XVIDIX) += libvo/vo_xvidix.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	661 SRCS_MPLAYER-$(XVMC) += libvo/vo_xvmc.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	662 SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c
7df791e22c3f Treat video output objects the same as everything else in the build system, diego parents: 28043 diff changeset	663 SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c
31334 7ab74cfbcabe Revert linking vd_zrmjpeg.c and vf_zrmjpeg.c to MPlayer only. diego parents: 31311 diff changeset	664 SRCS_MPLAYER-$(ZR) += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
26477 8c35fde6cdca Merge libvo/Makefile into top-level Makefile. diego parents: 26475 diff changeset	665
29276 ff43e2263d6d cosmetics: alphabetically sort SRCS_MPLAYER diego parents: 29268 diff changeset	666 SRCS_MPLAYER = command.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	667 m_property.c \
29276 ff43e2263d6d cosmetics: alphabetically sort SRCS_MPLAYER diego parents: 29268 diff changeset	668 mixer.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	669 mp_fifo.c \
29276 ff43e2263d6d cosmetics: alphabetically sort SRCS_MPLAYER diego parents: 29268 diff changeset	670 mplayer.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	671 parser-mpcmd.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	672 input/input.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	673 libao2/ao_mpegpes.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	674 libao2/ao_null.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	675 libao2/ao_pcm.c \
29276 ff43e2263d6d cosmetics: alphabetically sort SRCS_MPLAYER diego parents: 29268 diff changeset	676 libao2/audio_out.c \
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	677 libvo/aspect.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	678 libvo/geometry.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	679 libvo/spuenc.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	680 libvo/video_out.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	681 libvo/vo_mpegpes.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	682 libvo/vo_null.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	683 $(SRCS_MPLAYER-yes)
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	684
15772 d3d30585a9d2 Be more patch-friendly ranma parents: 15359 diff changeset	685
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	686 SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	687 SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	688 SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	689 SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c
30921 83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	690 SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \
83faa3af5f60 cosmetics: Break some overly long lines. diego parents: 30901 diff changeset	691 libmpcodecs/native/rtjpegn.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	692 SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c
26513 133c98f1c5a8 Only compile libmpcodecs/ve_qtvideo.c on Windows. diego parents: 26512 diff changeset	693 SRCS_MENCODER-$(QTX_CODECS_WIN32) += libmpcodecs/ve_qtvideo.c
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	694 SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	695 SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	696 SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	697 SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	698 SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	699
29167 aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	700 SRCS_MENCODER = mencoder.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	701 parser-mecmd.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	702 xvid_vbr.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	703 libmpcodecs/ae.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	704 libmpcodecs/ae_pcm.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	705 libmpcodecs/ve.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	706 libmpcodecs/ve_raw.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	707 libmpdemux/muxer.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	708 libmpdemux/muxer_avi.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	709 libmpdemux/muxer_mpeg.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	710 libmpdemux/muxer_rawaudio.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	711 libmpdemux/muxer_rawvideo.c \
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	712 $(SRCS_MENCODER-yes)
aea4b698808e Move non-conditional SRCS lists below the conditional parts. This allows diego parents: 29166 diff changeset	713
15772 d3d30585a9d2 Be more patch-friendly ranma parents: 15359 diff changeset	714
23281 e1935bbb44e2 Compile internal FFmpeg libraries only when configure enabled the static diego parents: 23220 diff changeset	715 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
e1935bbb44e2 Compile internal FFmpeg libraries only when configure enabled the static diego parents: 23220 diff changeset	716 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
e1935bbb44e2 Compile internal FFmpeg libraries only when configure enabled the static diego parents: 23220 diff changeset	717 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
e1935bbb44e2 Compile internal FFmpeg libraries only when configure enabled the static diego parents: 23220 diff changeset	718 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
27600 4a979c26d034 Add shared libswscale support. rathann parents: 27588 diff changeset	719 COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a
26577 d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	720 COMMON_LIBS += $(COMMON_LIBS-yes)
22796 7986e3f73008 cosmetics: Reorder parts of the Makefile in order to group parts sensibly together. diego parents: 22795 diff changeset	721
26577 d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	722 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	723 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)))
d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	724 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)))
d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	725 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	726 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
22796 7986e3f73008 cosmetics: Reorder parts of the Makefile in order to group parts sensibly together. diego parents: 22795 diff changeset	727
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	728 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
26555 a16bf3eba843 Get rid of now obsolete library rules and variables. diego parents: 26554 diff changeset	729 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
27172 fa689f1b187b Group some variable declarations together in sensible places. diego parents: 27171 diff changeset	730 DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
22796 7986e3f73008 cosmetics: Reorder parts of the Makefile in order to group parts sensibly together. diego parents: 22795 diff changeset	731
26577 d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	732 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
d1e4656332cf cosmetics: Move some variable declarations to better places. diego parents: 26574 diff changeset	733 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
26563 098e4774b951 Merge mpcommon.mak into Makefile. diego parents: 26562 diff changeset	734
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	735 INSTALL_TARGETS-$(GUI) += install-gui
26784 80227b63ccf8 install-mencoder-man depends on install-mplayer-man. diego parents: 26783 diff changeset	736 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	737 INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
22796 7986e3f73008 cosmetics: Reorder parts of the Makefile in order to group parts sensibly together. diego parents: 22795 diff changeset	738
26551 fe2f16a7b128 Merge now redundant clean and distclean rules into the top-level Makefile. diego parents: 26549 diff changeset	739 DIRS = . \
26496 99320e745ef3 Merge dvdread/Makefile into top-level Makefile. diego parents: 26494 diff changeset	740 gui \
26410 210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	741 gui/mplayer \
210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	742 gui/mplayer/gtk \
210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	743 gui/skin \
210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	744 gui/wm \
210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	745 gui/win32 \
210f869a7a31 Add gui subdirectories to DIRS instead of manually cleaning them. diego parents: 26409 diff changeset	746 input \
26344 3278dca99929 Merge libaf/Makefile into Makefile, one less instance of recursive make. diego parents: 26331 diff changeset	747 libaf \
26475 4fe4c27637e0 Merge libao2/Makefile into top-level Makefile. diego parents: 26471 diff changeset	748 libao2 \
26324 7cd64946eb11 Merge libass/Makefile into Makefile, one less recursive make directory. diego parents: 26323 diff changeset	749 libass \
26559 3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	750 libavcodec \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	751 libavcodec/alpha \
28123 2917db918851 libavcodec/armv4l/ was renamed to libavcodec/arm/. diego parents: 28046 diff changeset	752 libavcodec/arm \
26559 3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	753 libavcodec/bfin \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	754 libavcodec/mlib \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	755 libavcodec/ppc \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	756 libavcodec/sh4 \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	757 libavcodec/sparc \
28142 fb25bd1b00c6 libavcodec/i386/ was renamed to libavcodec/x86/. diego parents: 28124 diff changeset	758 libavcodec/x86 \
26559 3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	759 libavformat \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	760 libavutil \
29086 b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	761 libavutil/arm \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	762 libavutil/bfin \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	763 libavutil/ppc \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	764 libavutil/sh4 \
30622 463b81ee192b FFmpeg: Add tomi to architecture list. diego parents: 30531 diff changeset	765 libavutil/tomi \
29086 b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	766 libavutil/x86 \
26492 474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	767 libdvdcss \
28256 cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	768 libdvdnav \
cd79547b7467 Support an "internal" dvdnav version to make it easier to compile with, reimar parents: 28245 diff changeset	769 libdvdnav/vm \
28245 83266d299072 Switch internal dvdread to libdvdread SVN external. reimar parents: 28142 diff changeset	770 libdvdread4 \
26494 bfe8f4c47e45 Merge libfaad2/Makefile into top-level Makefile. diego parents: 26493 diff changeset	771 libfaad2 \
26311 a3d7fc4f186e Build all parts in the libmenu subdirectory nonrecursively. diego parents: 26308 diff changeset	772 libmenu \
26482 e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	773 libmpcodecs \
e3ddf3efdaec Merge libmpcodecs/Makefile into top-level Makefile. diego parents: 26478 diff changeset	774 libmpcodecs/native \
26491 d010bd754e80 Merge libmpdemux/Makefile into top-level Makefile. diego parents: 26490 diff changeset	775 libmpdemux \
26519 04da3c7a6326 Merge libmpeg2/Makefile into top-level Makefile. diego parents: 26516 diff changeset	776 libmpeg2 \
26559 3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	777 libpostproc \
3d56166e6566 Convert clean/distclean into non-recursive targets. diego parents: 26558 diff changeset	778 libswscale \
29086 b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	779 libswscale/bfin \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	780 libswscale/mlib \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	781 libswscale/ppc \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	782 libswscale/sparc \
b5c25fd3cf8f Add recently added FFmpeg subdirs to DIRS variable. diego parents: 29006 diff changeset	783 libswscale/x86 \
26477 8c35fde6cdca Merge libvo/Makefile into top-level Makefile. diego parents: 26475 diff changeset	784 libvo \
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	785 loader \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	786 loader/dshow \
671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	787 loader/dmo \
30169 73458c7f5957 Add loader/wine/ to DIRS; its headers should be part of checkheaders. diego parents: 30145 diff changeset	788 loader/wine \
26523 43d28f989428 Merge mp3lib/Makefile into top-level Makefile. diego parents: 26522 diff changeset	789 mp3lib \
26320 c0dba62cd135 Merge osdep/Makefile into the top-level Makefile, thus getting rid diego parents: 26311 diff changeset	790 osdep \
26483 b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	791 stream \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	792 stream/freesdp \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	793 stream/librtsp \
b04a2067f586 Merge stream/Makefile into top-level Makefile. diego parents: 26482 diff changeset	794 stream/realrtsp \
26471 f29c190fdb10 Merge tremor/Makefile into top-level Makefile. diego parents: 26469 diff changeset	795 tremor \
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	796 TOOLS \
26516 7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	797 vidix \
7474 aa2274311ebb some makefile cleanup arpi parents: 7446 diff changeset	798
27172 fa689f1b187b Group some variable declarations together in sensible places. diego parents: 27171 diff changeset	799 ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
fa689f1b187b Group some variable declarations together in sensible places. diego parents: 27171 diff changeset	800
29161 68dbcaf8e594 Introduce ADDSUFFIXES function and use it to simplify the diego parents: 29160 diff changeset	801 ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
68dbcaf8e594 Introduce ADDSUFFIXES function and use it to simplify the diego parents: 29160 diff changeset	802 ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS))
68dbcaf8e594 Introduce ADDSUFFIXES function and use it to simplify the diego parents: 29160 diff changeset	803 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
29160 001484135b6f cosmetics: Move ADD_ALL_* functions to a more sensible place. diego parents: 29156 diff changeset	804
29155 3f4843f064ad cosmetics: Rename PARTS variable to FFMPEGPARTS. diego parents: 29154 diff changeset	805 FFMPEGPARTS = libavcodec \
29156 15c34dd9583f whitespace cosmetics diego parents: 29155 diff changeset	806 libavformat \
15c34dd9583f whitespace cosmetics diego parents: 29155 diff changeset	807 libavutil \
15c34dd9583f whitespace cosmetics diego parents: 29155 diff changeset	808 libpostproc \
15c34dd9583f whitespace cosmetics diego parents: 29155 diff changeset	809 libswscale \
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	810
29155 3f4843f064ad cosmetics: Rename PARTS variable to FFMPEGPARTS. diego parents: 29154 diff changeset	811 FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a)
29163 e5e1ecf7a172 Only add existing files to the FFMPEGFILES variable. diego parents: 29162 diff changeset	812 FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/.[chS] $(part)//*.[chS]))
27172 fa689f1b187b Group some variable declarations together in sensible places. diego parents: 27171 diff changeset	813
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	814
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	815
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	816 ###### generic rules #######
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	817
26794 cf60ce406b0b one less level of indirection for install and program targets diego parents: 26791 diff changeset	818 all: $(ALL_PRG-yes)
7474 aa2274311ebb some makefile cleanup arpi parents: 7446 diff changeset	819
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	820 %.ho: %.h
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	821 $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	822
30683 c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	823 %.o: %.S
c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	824 $(CC) $(ASFLAGS) -c -o $@ $<
c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	825
c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	826 %.o: %.c
31548 0c9300413b28 Separate automatic dependency generation flags from general CFLAGS. diego parents: 31524 diff changeset	827 $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
30683 c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	828
c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	829 %.o: %.cpp
31548 0c9300413b28 Separate automatic dependency generation flags from general CFLAGS. diego parents: 31524 diff changeset	830 $(CC) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
30683 c744dec7ed98 Disable old-style implicit rules to fix MinGW/Cygwin compilation reimar parents: 30622 diff changeset	831
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	832 %.o: %.m
31548 0c9300413b28 Separate automatic dependency generation flags from general CFLAGS. diego parents: 31524 diff changeset	833 $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	834
27187 c543d4349e73 Add a generic rule for .rc files and use it. diego parents: 27186 diff changeset	835 %-rc.o: %.rc
c543d4349e73 Add a generic rule for .rc files and use it. diego parents: 27186 diff changeset	836 $(WINDRES) -I. $< $@
c543d4349e73 Add a generic rule for .rc files and use it. diego parents: 27186 diff changeset	837
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	838 checkheaders: $(ALLHEADERS:.h=.ho)
26572 cbd512d4a527 Explicitly declare which dependency files need generated headers. diego parents: 26569 diff changeset	839
26432 7f5696224182 per-file dependencies (for the non-recursive parts) diego parents: 26430 diff changeset	840 dep depend: $(DEPS)
29155 3f4843f064ad cosmetics: Rename PARTS variable to FFMPEGPARTS. diego parents: 29154 diff changeset	841 for part in $(FFMPEGPARTS); do $(MAKE) -C $$part depend; done
23181 802db540ff83 cosmetics: Move depend target (preparation for upcoming change). diego parents: 23093 diff changeset	842
27433 9aec56f5e314 FFmpeg no longer has fastmemcpy support, so no longer trigger recursing diego parents: 27420 diff changeset	843 $(FFMPEGLIBS): $(FFMPEGFILES) config.h
26826 039574a7dc1e Get rid of "define RECURSIVE_RULE" since a lot of make version have problems reimar parents: 26804 diff changeset	844 $(MAKE) -C $(@D)
27099 1294f728042a Touch FFmpeg libraries after recursing into their subdirectories. diego parents: 27098 diff changeset	845 touch $@
1 3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	846
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	847 mencoder$(EXESUF): $(MENCODER_DEPS)
29742 3bd28ab606db Get rid of COMMON_LDFLAGS variable. It was a pointless indirection. diego parents: 29737 diff changeset	848 mencoder$(EXESUF): EXTRALIBS += $(EXTRALIBS_MENCODER)
21085 6a152d4ee3ae Rename variables for consistency. diego parents: 21084 diff changeset	849 mplayer$(EXESUF): $(MPLAYER_DEPS)
29742 3bd28ab606db Get rid of COMMON_LDFLAGS variable. It was a pointless indirection. diego parents: 29737 diff changeset	850 mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
29737 25166964e1ec Merge rules for building mencoder and mplayer. diego parents: 29736 diff changeset	851 mencoder$(EXESUF) mplayer$(EXESUF):
29742 3bd28ab606db Get rid of COMMON_LDFLAGS variable. It was a pointless indirection. diego parents: 29737 diff changeset	852 $(CC) -o $@ $^ $(EXTRALIBS)
1 3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	853
31214 0bdd15feba42 Add codec-cfg.h to the dependency list of codec-cfg. diego parents: 31116 diff changeset	854 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
29006 1ce71e660a4b Do not use full CFLAGS to build codec-cfg, they are unnecessary. diego parents: 28915 diff changeset	855 $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<
19051 7d1896a52428 Clean up codec-cfg and friends handling. diego parents: 19048 diff changeset	856
20791 b5045bb4f1aa 10l: Overlooked one $(EXESUF) addition. diego parents: 20755 diff changeset	857 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
27190 ec54fc8ebe83 Simplify codecs.conf.h generation rule. diego parents: 27189 diff changeset	858 ./$^ > $@
8467 3ca9cc46df5c Fallback to builtin (generated from etc/codecs.conf at compile time) arpi parents: 8353 diff changeset	859
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	860 # ./configure must be rerun if it changed
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	861 config.mak: configure
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	862 @echo "############################################################"
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	863 @echo "####### Please run ./configure again - it's changed! #######"
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	864 @echo "############################################################"
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	865
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	866 help_mp.h: help/help_mp-en.h $(HELP_FILE)
26878 73921138ff30 Move messages header file creation to a separate shell script. diego parents: 26872 diff changeset	867 help/help_create.sh $(HELP_FILE) $(CHARSET)
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	868
26855 a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	869 # rebuild version.h each time the working copy is updated
a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	870 ifeq ($(wildcard .svn/entries),.svn/entries)
a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	871 version.h: .svn/entries
a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	872 endif
28334 9e4c389f670f version.h depends on version.sh. diego parents: 28326 diff changeset	873 version.h: version.sh
9e4c389f670f version.h depends on version.sh. diego parents: 28326 diff changeset	874 ./$< `$(CC) -dumpversion`
26855 a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	875
31335 c9f185fdf201 typo: Add missing '$' to EXESUF variable in binary build rule. diego parents: 31334 diff changeset	876 %$(EXESUF): %.c
31336 10120676ffab Add a command to the binary build rule. diego parents: 31335 diff changeset	877 $(CC) $(CFLAGS) -o $@ $^
27161 b4094f8dccf0 Simplify tool generation rules with a pattern rule. diego parents: 27160 diff changeset	878
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	879
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	880
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	881 ###### dependency declarations / specific CFLAGS ######
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	882
28735 ec73d66cf714 Make all object files depend on generated header files. diego parents: 28734 diff changeset	883 # Make sure all generated header files are created.
29113 239a06704f60 Specify precise dependencies for generated header file codecs.conf.h. diego parents: 29112 diff changeset	884 codec-cfg.d codec-cfg.o: codecs.conf.h
239a06704f60 Specify precise dependencies for generated header file codecs.conf.h. diego parents: 29112 diff changeset	885 $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
31511 13ca93203358 Factorize MPlayer/MEncoder version string handling. diego parents: 31462 diff changeset	886 $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	887
31564 480cdba9e480 Add a manifest file to disable file and registry reimar parents: 31548 diff changeset	888 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
480cdba9e480 Add a manifest file to disable file and registry reimar parents: 31548 diff changeset	889
31447 bb6a85295322 Shut up strict prototype warnings from the gui subdirectory. diego parents: 31349 diff changeset	890 gui/%: CFLAGS += -Wno-strict-prototypes
bb6a85295322 Shut up strict prototype warnings from the gui subdirectory. diego parents: 31349 diff changeset	891
29261 78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	892 libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	893 libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	894 libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	895 libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
26492 474d0127039a Merge libdvdcss/Makefile into top-level Makefile. diego parents: 26491 diff changeset	896
30170 008338d7679f Drop -Iloader from CPPFLAGS for the loader subdirectory. diego parents: 30169 diff changeset	897 loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
28792 ca641bd35f98 Simplify CFLAGS generation for individual targets. diego parents: 28780 diff changeset	898 #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
ca641bd35f98 Simplify CFLAGS generation for individual targets. diego parents: 28780 diff changeset	899 loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)
26541 671c0e7892c0 Merge loader/Makefile into top-level Makefile. diego parents: 26540 diff changeset	900
28792 ca641bd35f98 Simplify CFLAGS generation for individual targets. diego parents: 28780 diff changeset	901 mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer
26523 43d28f989428 Merge mp3lib/Makefile into top-level Makefile. diego parents: 26522 diff changeset	902
29261 78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	903 stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS)
78e51575201b Make sure that -I flags for internal library copies come before other CFLAGS diego parents: 29259 diff changeset	904
28792 ca641bd35f98 Simplify CFLAGS generation for individual targets. diego parents: 28780 diff changeset	905 tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW)
27404 778fac8c186f Add separate variables for CFLAGS that are specific to internal libraries diego parents: 27402 diff changeset	906
27402 0439868f668d cosmetics: Rename some CFLAGS-related variables. diego parents: 27401 diff changeset	907 vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER)
26993 c1dfb011c41d Restore support for compiling with svgalib_helper. diego parents: 26981 diff changeset	908
30172 fbff89bae6a4 Remove previous failed attempt at disabling that auto-generation of some C code. diego parents: 30170 diff changeset	909 VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
30046 844755b5d7b6 Do not autogenerate vidix/pci_names.h. diego parents: 30035 diff changeset	910 vidix/pci_vendors.h
26516 7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	911
28375 4558bc0ceb9a Slightly simplify VIDIX_PCI_FILES command. diego parents: 28335 diff changeset	912 $(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db
30174 84f7e547aaf2 Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it. diego parents: 30172 diff changeset	913 awk -f $^ $(VIDIX_PCIDB)
26516 7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	914
26539 d572ecfb34ae Make sure all autogenerated .h and .c files exist in the vidix subdirectory diego parents: 26525 diff changeset	915 VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d))
d572ecfb34ae Make sure all autogenerated .h and .c files exist in the vidix subdirectory diego parents: 26525 diff changeset	916 VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o))
d572ecfb34ae Make sure all autogenerated .h and .c files exist in the vidix subdirectory diego parents: 26525 diff changeset	917
d572ecfb34ae Make sure all autogenerated .h and .c files exist in the vidix subdirectory diego parents: 26525 diff changeset	918 $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES)
26516 7b3c38ffae47 Merge vidix/Makefile into top-level Makefile. diego parents: 26514 diff changeset	919
26589 47f08d44cfa7 Add testclean target and make distclean depend upon it. diego parents: 26588 diff changeset	920
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	921
26863 6a5879b897b5 Update comment heading. diego parents: 26862 diff changeset	922 ###### installation / clean / generic rules #######
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	923
26794 cf60ce406b0b one less level of indirection for install and program targets diego parents: 26791 diff changeset	924 install: $(INSTALL_TARGETS-yes)
22052 d90d335368b1 Replace ifeq structure in the install target by a set of dependent targets. diego parents: 21999 diff changeset	925
22054 9be62c47daa5 cosmetics: Reorder install targets. diego parents: 22053 diff changeset	926 install-dirs:
27759 6fdb5269fe86 Create LIBDIR for binary codecs upon make install. diego parents: 27646 diff changeset	927 $(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
22052 d90d335368b1 Replace ifeq structure in the install target by a set of dependent targets. diego parents: 21999 diff changeset	928
26791 daa735e525a4 install-mplayer and install-mencoder targets should depend on install-dirs. diego parents: 26790 diff changeset	929 install-%: %$(EXESUF) install-dirs
26777 93463ecf0a14 Simplify installation rules with $<. diego parents: 26776 diff changeset	930 $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
22052 d90d335368b1 Replace ifeq structure in the install target by a set of dependent targets. diego parents: 21999 diff changeset	931
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	932 install-gui: install-mplayer
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	933 -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	934 $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	935 $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	936 $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	937
29110 102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	938 install-gui-man: $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	939 install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
27279 6d8527aeeebb Rewrite translation handling in the build system. diego parents: 27275 diff changeset	940 install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	941
29110 102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	942 install-gui-man-en: install-mplayer-man-en
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	943 cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	944
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	945 install-mencoder-man-en: install-mplayer-man-en
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	946 cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
26788 0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	947
0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	948 install-mplayer-man-en:
26789 49eb016d1219 Install the required man page directories in the man page targets. diego parents: 26788 diff changeset	949 $(INSTALL) -d $(MANDIR)/man1
28388 69391048c83c Remove -c option from install commands. It is ignored by GNU install and diego parents: 28375 diff changeset	950 $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
26788 0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	951
29110 102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	952 define GUI_MAN_RULE
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	953 install-gui-man-$(lang): install-mplayer-man-$(lang)
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	954 cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	955 endef
102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	956
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	957 define MENCODER_MAN_RULE
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	958 install-mencoder-man-$(lang): install-mplayer-man-$(lang)
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	959 cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	960 endef
22052 d90d335368b1 Replace ifeq structure in the install target by a set of dependent targets. diego parents: 21999 diff changeset	961
26788 0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	962 define MPLAYER_MAN_RULE
0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	963 install-mplayer-man-$(lang):
26789 49eb016d1219 Install the required man page directories in the man page targets. diego parents: 26788 diff changeset	964 $(INSTALL) -d $(MANDIR)/$(lang)/man1
28388 69391048c83c Remove -c option from install commands. It is ignored by GNU install and diego parents: 28375 diff changeset	965 $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
26788 0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	966 endef
0bec9426c86d Replace hackish shell loops for man page installation with make constructs. diego parents: 26787 diff changeset	967
29110 102e7b8da1a2 Add rules to install gmplayer manual pages. diego parents: 29093 diff changeset	968 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(GUI_MAN_RULE)))
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	969 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
27298 0de5b595d2ae Remove "en" from list of all man page languages when generating man page diego parents: 27279 diff changeset	970 $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
22052 d90d335368b1 Replace ifeq structure in the install target by a set of dependent targets. diego parents: 21999 diff changeset	971
2385 78209b784fec Add uninstall target, patch by Clemens W��chter <clemenswaechter@yahoo.com> atmos4 parents: 2310 diff changeset	972 uninstall:
26772 e60dfd4ffeae There is no need to ignore errors from 'rm -f' commands. diego parents: 26771 diff changeset	973 rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
e60dfd4ffeae There is no need to ignore errors from 'rm -f' commands. diego parents: 26771 diff changeset	974 rm -f $(BINDIR)/mencoder$(EXESUF)
e60dfd4ffeae There is no need to ignore errors from 'rm -f' commands. diego parents: 26771 diff changeset	975 rm -f $(MANDIR)/man1/mencoder.1 $(MANDIR)/man1/mplayer.1
e60dfd4ffeae There is no need to ignore errors from 'rm -f' commands. diego parents: 26771 diff changeset	976 rm -f $(prefix)/share/pixmaps/mplayer.xpm
e60dfd4ffeae There is no need to ignore errors from 'rm -f' commands. diego parents: 26771 diff changeset	977 rm -f $(prefix)/share/applications/mplayer.desktop
26782 5282159223e2 Always uninstall English man pages instead of never. diego parents: 26781 diff changeset	978 rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
27279 6d8527aeeebb Rewrite translation handling in the build system. diego parents: 27275 diff changeset	979 rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man)))
2385 78209b784fec Add uninstall target, patch by Clemens W��chter <clemenswaechter@yahoo.com> atmos4 parents: 2310 diff changeset	980
26590 ccfcdc2323aa Remove tools on distclean, not on clean. diego parents: 26589 diff changeset	981 clean:
29154 d26f4b307224 Introduce ADD_ALL_DIRS function to factorize clean and distclean target commands diego parents: 29153 diff changeset	982 -rm -f $(call ADD_ALL_DIRS,/.o /.a /.ho /~)
29152 97ab4928cd4d Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one. diego parents: 29151 diff changeset	983 -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder)
19292 20938447bb55 'make clean' now recurses through subdirectories as expected, diego parents: 19283 diff changeset	984
27185 ff18b81371e5 Also remove dhahelper and dhahelperwin on distclean. diego parents: 27173 diff changeset	985 distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean
28505 f3fa6fe243e6 Ignore errors from all rm commands in clean targets. diego parents: 28504 diff changeset	986 -rm -rf DOCS/tech/doxygen
29154 d26f4b307224 Introduce ADD_ALL_DIRS function to factorize clean and distclean target commands diego parents: 29153 diff changeset	987 -rm -f $(call ADD_ALL_DIRS,/*.d)
31349 92d75e703bc0 Rename configure.log file to the more standard name config.log. diego parents: 31341 diff changeset	988 -rm -f config.log config.mak config.h codecs.conf.h help_mp.h \
28504 b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	989 version.h $(VIDIX_PCI_FILES) TAGS tags
29152 97ab4928cd4d Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one. diego parents: 29151 diff changeset	990 -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)
1 3b5f5d1c5041 Initial revision arpi_esp parents: diff changeset	991
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	992 doxygen:
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	993 doxygen DOCS/tech/Doxyfile
6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	994
25633 7ab58f012dd3 allow generation of ctags and etags ben parents: 25440 diff changeset	995 TAGS:
29268 170369ec951c Add missing path to find invocation for tags/TAGS creation. diego parents: 29267 diff changeset	996 rm -f $@; find . -name '.[chS]' -o -name '.asm' \| xargs etags -a
25633 7ab58f012dd3 allow generation of ctags and etags ben parents: 25440 diff changeset	997
7ab58f012dd3 allow generation of ctags and etags ben parents: 25440 diff changeset	998 tags:
29268 170369ec951c Add missing path to find invocation for tags/TAGS creation. diego parents: 29267 diff changeset	999 rm -f $@; find . -name '.[chS]' -o -name '.asm' \| xargs ctags -a
25633 7ab58f012dd3 allow generation of ctags and etags ben parents: 25440 diff changeset	1000
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1001
26676 84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	1002
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	1003 ###### tests / tools #######
84d1a6f19490 Add some comment headings to divide the Makefile into logical chapters. diego parents: 26675 diff changeset	1004
31311 9ce59b78dbfd Remove mp_msg related GUI hacks. reimar parents: 31295 diff changeset	1005 TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1006
28733 702db4355c75 Fix dependencies on generated header files for the codec* binaries. diego parents: 28661 diff changeset	1007 codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
27399 eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	1008 $(CC) -I. -DTESTING -o $@ $^
eb9b0b46009d cosmetics: Sort things into alphabetical order in various places. diego parents: 27397 diff changeset	1009
28733 702db4355c75 Fix dependencies on generated header files for the codec* binaries. diego parents: 28661 diff changeset	1010 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
26862 4e767be57263 cosmetics: Consistently place '-o $@' in compiler command line. diego parents: 26861 diff changeset	1011 $(CC) -I. -DCODECS2HTML -o $@ $^
26855 a8a0d256c7fc cosmetics: Move some rules to better places. diego parents: 26854 diff changeset	1012
27161 b4094f8dccf0 Simplify tool generation rules with a pattern rule. diego parents: 27160 diff changeset	1013 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1014
31341 51e187da29dd Add path.o to the dependency list of the loader test programs. diego parents: 31336 diff changeset	1015 LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS)
26563 098e4774b951 Merge mpcommon.mak into Makefile. diego parents: 26562 diff changeset	1016
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1017 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
27161 b4094f8dccf0 Simplify tool generation rules with a pattern rule. diego parents: 27160 diff changeset	1018 loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1019
30486 51db2b34b91c Fix linking of mp3lib test programs when internal mp3lib is disabled. diego parents: 30485 diff changeset	1020 mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
6958 9cb1efcc5640 'configure changed'-test re-added, noticed by Sylvain Petreolle <spetreolle@yahoo.fr> arpi parents: 6948 diff changeset	1021
31090 1aece15222b5 Remove internal liba52 copy. diego parents: 31032 diff changeset	1022 TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
13097 c7afdb04c8c8 Adding doxygen stuff. attila parents: 13006 diff changeset	1023
27160 0fdfa72628a1 Only build loader tests on x86. diego parents: 27159 diff changeset	1024 ifdef ARCH_X86
28504 b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	1025 TESTS += loader/qtx/list loader/qtx/qtxload
27160 0fdfa72628a1 Only build loader tests on x86. diego parents: 27159 diff changeset	1026 endif
0fdfa72628a1 Only build loader tests on x86. diego parents: 27159 diff changeset	1027
28504 b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	1028 tests: $(addsuffix $(EXESUF),$(TESTS))
13097 c7afdb04c8c8 Adding doxygen stuff. attila parents: 13006 diff changeset	1029
26675 6b747c6ce030 cosmetics: Move some stuff around for more logical grouping. diego parents: 26672 diff changeset	1030 testsclean:
29152 97ab4928cd4d Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one. diego parents: 29151 diff changeset	1031 -rm -f $(call ADD_ALL_EXESUFS,$(TESTS))
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1032
28910 a4cee9518a50 Only compile fastmemcpybench on x86. diego parents: 28894 diff changeset	1033 TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump)
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1034
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1035 ifdef ARCH_X86
28910 a4cee9518a50 Only compile fastmemcpybench on x86. diego parents: 28894 diff changeset	1036 TOOLS += TOOLS/fastmemcpybench TOOLS/modify_reg
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1037 endif
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1038
28504 b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	1039 ALLTOOLS = $(TOOLS) TOOLS/bmovl-test TOOLS/vfw2menc
26512 a1dc4d5b5b40 Add alltools target and variable to build non-linking tools. diego parents: 26511 diff changeset	1040
28504 b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	1041 tools: $(addsuffix $(EXESUF),$(TOOLS))
b983d65e840c On clean/distclean, remove binaries with all types of executable suffixes. diego parents: 28503 diff changeset	1042 alltools: $(addsuffix $(EXESUF),$(ALLTOOLS))
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1043
26864 428910380407 cosmetics: Move toolsclean target to a better place. diego parents: 26863 diff changeset	1044 toolsclean:
29153 6a38cc6d7b26 Convert another forgotten ADD_ALL_EXESUFS call. diego parents: 29152 diff changeset	1045 -rm -f $(call ADD_ALL_EXESUFS,$(ALLTOOLS))
28894 b29169fccda9 Fix and restructure fastmemcpybench. It is now one binary that runs all diego parents: 28872 diff changeset	1046 -rm -f TOOLS/realcodecs/*.so.6.0
26864 428910380407 cosmetics: Move toolsclean target to a better place. diego parents: 26863 diff changeset	1047
27161 b4094f8dccf0 Simplify tool generation rules with a pattern rule. diego parents: 27160 diff changeset	1048 TOOLS/bmovl-test$(EXESUF): -lSDL_image
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1049
27186 b5c864852dca cosmetics: Merge three lines into two. diego parents: 27185 diff changeset	1050 TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \
b5c864852dca cosmetics: Merge three lines into two. diego parents: 27185 diff changeset	1051 libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS)
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1052
27161 b4094f8dccf0 Simplify tool generation rules with a pattern rule. diego parents: 27160 diff changeset	1053 TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1054
26963 8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump. diego parents: 26904 diff changeset	1055 mplayer-nomain.o: mplayer.c
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump. diego parents: 26904 diff changeset	1056 $(CC) $(CFLAGS) -DDISABLE_MAIN -c -o $@ $<
8825552ee585 Fix the linking of TOOLS/netstream and TOOLS/vivodump. diego parents: 26904 diff changeset	1057
27154 01526c8e2d75 Declare common netstream + vivodump dependencies in the common place. diego parents: 27151 diff changeset	1058 TOOLS/netstream$(EXESUF): TOOLS/netstream.c
01526c8e2d75 Declare common netstream + vivodump dependencies in the common place. diego parents: 27151 diff changeset	1059 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c
01526c8e2d75 Declare common netstream + vivodump dependencies in the common place. diego parents: 27151 diff changeset	1060 TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS)
29742 3bd28ab606db Get rid of COMMON_LDFLAGS variable. It was a pointless indirection. diego parents: 29737 diff changeset	1061 $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS)
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1062
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1063 REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c)
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1064 REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0)
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1065
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1066 realcodecs: $(REAL_TARGETS)
28894 b29169fccda9 Fix and restructure fastmemcpybench. It is now one binary that runs all diego parents: 28872 diff changeset	1067 realcodecs: CFLAGS += -g
26455 4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1068
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1069 %.so.6.0: %.o
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1070 ld -shared -o $@ $< -ldl -lc
4d9fad055ac9 Merge TOOLS/Makefile into the top-level Makefile. diego parents: 26435 diff changeset	1071
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1072
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1073
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1074 ###### drivers #######
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1075
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1076 KERNEL_INC = /lib/modules/`uname -r`/build/include
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1077 KERNEL_VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h \| cut -d'"' -f2)
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1078 KERNEL_CFLAGS = -O2 -D__KERNEL__ -DMODULE -Wall -I$(KERNEL_INC) -include $(KERNEL_INC)/linux/modversions.h
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1079 KERNEL_OBJS = $(addprefix drivers/, mga_vid.o tdfx_vid.o radeon_vid.o rage128_vid.o)
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1080 MODULES_DIR = /lib/modules/$(KERNEL_VERSION)/misc
27191 0c39ee17759a Introduce DRIVER_OBJS variable for list of all driver targets. diego parents: 27190 diff changeset	1081 DRIVER_OBJS = $(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1082
27191 0c39ee17759a Introduce DRIVER_OBJS variable for list of all driver targets. diego parents: 27190 diff changeset	1083 drivers: $(DRIVER_OBJS)
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1084
27191 0c39ee17759a Introduce DRIVER_OBJS variable for list of all driver targets. diego parents: 27190 diff changeset	1085 $(DRIVER_OBJS): CFLAGS = $(KERNEL_CFLAGS)
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1086 drivers/mga_vid.o: drivers/mga_vid.c drivers/mga_vid.h
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1087 drivers/tdfx_vid.o: drivers/tdfx_vid.c drivers/3dfx.h
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1088 drivers/radeon_vid.o drivers/rage128_vid.o: CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1089 drivers/radeon_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1090 drivers/rage128_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1091 $(CC) $(CFLAGS) -DRAGE128 -c $< -o $@
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1092
27191 0c39ee17759a Introduce DRIVER_OBJS variable for list of all driver targets. diego parents: 27190 diff changeset	1093 install-drivers: $(DRIVER_OBJS)
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1094 -mkdir -p $(MODULES_DIR)
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1095 install -m 644 $(KERNEL_OBJS) $(MODULES_DIR)
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1096 depmod -a
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1097 -mknod /dev/mga_vid c 178 0
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1098 -mknod /dev/tdfx_vid c 178 0
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1099 -mknod /dev/radeon_vid c 178 0
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1100 -ln -s /dev/radeon_vid /dev/rage128_vid
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1101
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1102 driversclean:
28505 f3fa6fe243e6 Ignore errors from all rm commands in clean targets. diego parents: 28504 diff changeset	1103 -rm -f $(DRIVER_OBJS) drivers/*~
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1104
26902 95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1105 dhahelper: vidix/dhahelper/dhahelper.o vidix/dhahelper/test
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1106
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1107 vidix/dhahelper/dhahelper.o vidix/dhahelper/test: CFLAGS = $(KERNEL_CFLAGS)
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1108 vidix/dhahelper/dhahelper.o: vidix/dhahelper/dhahelper.c vidix/dhahelper/dhahelper.h
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1109
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1110 install-dhahelper: vidix/dhahelper/dhahelper.o
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1111 -mkdir -p $(MODULES_DIR)
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1112 install -m 644 $< $(MODULES_DIR)
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1113 depmod -a
27000 c86217387637 Add command to create dhahelper device to install-dhahelper target. diego parents: 26999 diff changeset	1114 -mknod /dev/dhahelper c 180 0
26902 95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1115
95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1116 dhahelperclean:
28505 f3fa6fe243e6 Ignore errors from all rm commands in clean targets. diego parents: 28504 diff changeset	1117 -rm -f vidix/dhahelper/.o vidix/dhahelper/~ vidix/dhahelper/test
26902 95d324b7de18 Merge vidix/dhahelper/Makefile into top-level Makefile. diego parents: 26884 diff changeset	1118
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1119 dhahelperwin: vidix/dhahelperwin/dhasetup.exe vidix/dhahelperwin/dhahelper.sys
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1120
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1121 vidix/dhahelperwin/dhasetup.exe: vidix/dhahelperwin/dhasetup.c
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1122 $(CC) -o $@ $<
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1123
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1124 vidix/dhahelperwin/dhahelper.o: vidix/dhahelperwin/dhahelper.c vidix/dhahelperwin/dhahelper.h
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1125 $(CC) -Wall -Os -c $< -o $@
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1126
27188 8b7f0838d2ec Remove redundant dependencies for .rc files. diego parents: 27187 diff changeset	1127 vidix/dhahelperwin/dhahelper-rc.o: vidix/dhahelperwin/common.ver vidix/dhahelperwin/ntverp.h
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1128
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1129 vidix/dhahelperwin/base.tmp: vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1130 $(CC) -Wl,--base-file,$@ -Wl,--entry,_DriverEntry@8 -nostartfiles \
28780 0f67e29affb9 Simplify some vidix dhahelper build commands with automatic make variables. diego parents: 28740 diff changeset	1131 -nostdlib -o $(@D)/junk.tmp $^ -lntoskrnl
0f67e29affb9 Simplify some vidix dhahelper build commands with automatic make variables. diego parents: 28740 diff changeset	1132 -rm -f $(@D)/junk.tmp
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1133
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1134 vidix/dhahelperwin/temp.exp: vidix/dhahelperwin/base.tmp
28780 0f67e29affb9 Simplify some vidix dhahelper build commands with automatic make variables. diego parents: 28740 diff changeset	1135 dlltool --dllname $(@D)/dhahelper.sys --base-file $< --output-exp $@
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1136
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1137 vidix/dhahelperwin/dhahelper.sys: vidix/dhahelperwin/temp.exp vidix/dhahelperwin/dhahelper.o vidix/dhahelperwin/dhahelper-rc.o
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1138 $(CC) -Wl,--subsystem,native -Wl,--image-base,0x10000 \
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1139 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 \
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1140 -Wl,--entry,_DriverEntry@8 -Wl,$< -mdll -nostartfiles -nostdlib \
28780 0f67e29affb9 Simplify some vidix dhahelper build commands with automatic make variables. diego parents: 28740 diff changeset	1141 -o $@ $(@:.sys=.o) $(@:.sys=-rc.o) -lntoskrnl
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1142 strip $@
5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1143
26904 b4a743e6d17d Add install-dhahelperwin target to simplify dhahelper installation on Windows. diego parents: 26903 diff changeset	1144 install-dhahelperwin:
b4a743e6d17d Add install-dhahelperwin target to simplify dhahelper installation on Windows. diego parents: 26903 diff changeset	1145 vidix/dhahelperwin/dhasetup.exe install
b4a743e6d17d Add install-dhahelperwin target to simplify dhahelper installation on Windows. diego parents: 26903 diff changeset	1146
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1147 dhahelperwinclean:
28505 f3fa6fe243e6 Ignore errors from all rm commands in clean targets. diego parents: 28504 diff changeset	1148 -rm -f $(addprefix vidix/dhahelperwin/,.o ~ dhahelper.sys dhasetup.exe base.tmp temp.exp)
26903 5ed6787022c4 Merge vidix/dhahelperwin/Makefile into top-level Makefile. diego parents: 26902 diff changeset	1149
26882 8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1150
8eacd1538e64 Merge drivers/Makefile into top-level Makefile. diego parents: 26878 diff changeset	1151
27439 1bbfa128dc71 Remove SKIP_DEPS trick. The same effect can be achieved without it. diego parents: 27433 diff changeset	1152 # Do not include dependencies when they are about to be removed anyway.
27411 c38f90ae922a Skip dependency generation if we just run distclean or if skipping diego parents: 27404 diff changeset	1153 ifneq ($(MAKECMDGOALS),distclean)
26540 362f8c285877 Restore line mistakenly commented out in the last commit. diego parents: 26539 diff changeset	1154 -include $(DEPS)
27411 c38f90ae922a Skip dependency generation if we just run distclean or if skipping diego parents: 27404 diff changeset	1155 endif
26490 17650f2caef1 Explicitly include dependency information in top-level Makefile. diego parents: 26489 diff changeset	1156
27098 d026baa6a86a Do not unconditionally recurse into FFmpeg subdirectories. Instead, just diego parents: 27080 diff changeset	1157 .PHONY: all doxygen install tools drivers dhahelper
26585 bb7a4686d158 Add new tests target to build all test programs and remove them on distclean. diego parents: 26584 diff changeset	1158 .PHONY: checkheaders *clean dep depend tests
31462 1764d80899b8 Move the .SUFFIXES rule to the bottom of the Makefile and explain it. diego parents: 31447 diff changeset	1159
1764d80899b8 Move the .SUFFIXES rule to the bottom of the Makefile and explain it. diego parents: 31447 diff changeset	1160 # Disable suffix rules. Most of the builtin rules are suffix rules,
1764d80899b8 Move the .SUFFIXES rule to the bottom of the Makefile and explain it. diego parents: 31447 diff changeset	1161 # so this saves some time on slow systems.
1764d80899b8 Move the .SUFFIXES rule to the bottom of the Makefile and explain it. diego parents: 31447 diff changeset	1162 .SUFFIXES:

Mercurial > mplayer.hg

annotate Makefile @ 31665:02d92c137407