summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
commit1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch)
treec5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /Makefile
parentf2864e9a072f53c38a04dd7c44392521777dc908 (diff)
parent86c9fb2e8930de031807513c9b93d47394d2d2fa (diff)
downloadmpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2
mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz
Merge svn changes up to r29277
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile547
1 files changed, 279 insertions, 268 deletions
diff --git a/Makefile b/Makefile
index d884632178..9d342f651c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,200 +33,10 @@ LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
$(COMMON_LDFLAGS) \
-SRCS_COMMON = asxparser.c \
- codec-cfg.c \
- cpudetect.c \
- defaultopts.c \
- edl.c \
- find_sub.c \
- fmt-conversion.c \
- get_path.c \
- m_config.c \
- m_option.c \
- m_struct.c \
- mpcommon.c \
- parser-cfg.c \
- playtree.c \
- playtreeparser.c \
- spudec.c \
- sub_cc.c \
- subopt-helper.c \
- subreader.c \
- talloc.c \
- vobsub.c \
- libaf/af.c \
- libaf/af_center.c \
- libaf/af_channels.c \
- libaf/af_comp.c \
- libaf/af_delay.c \
- libaf/af_dummy.c \
- libaf/af_equalizer.c \
- libaf/af_extrastereo.c \
- libaf/af_format.c \
- libaf/af_gate.c \
- libaf/af_hrtf.c \
- libaf/af_karaoke.c \
- libaf/af_pan.c \
- libaf/af_resample.c \
- libaf/af_scaletempo.c \
- libaf/af_sinesuppress.c \
- libaf/af_stats.c \
- libaf/af_sub.c \
- libaf/af_surround.c \
- libaf/af_sweep.c \
- libaf/af_tools.c \
- libaf/af_volnorm.c \
- libaf/af_volume.c \
- libaf/filter.c \
- libaf/format.c \
- libaf/reorder_ch.c \
- libaf/window.c \
- libmpcodecs/ad.c \
- libmpcodecs/ad_alaw.c \
- libmpcodecs/ad_dk3adpcm.c \
- libmpcodecs/ad_dvdpcm.c \
- libmpcodecs/ad_hwmpa.c \
- libmpcodecs/ad_imaadpcm.c \
- libmpcodecs/ad_msadpcm.c \
- libmpcodecs/ad_msgsm.c \
- libmpcodecs/ad_pcm.c \
- libmpcodecs/dec_audio.c \
- libmpcodecs/dec_video.c \
- libmpcodecs/img_format.c \
- libmpcodecs/mp_image.c \
- libmpcodecs/native/xa_gsm.c \
- libmpcodecs/pullup.c \
- libmpcodecs/vd.c \
- libmpcodecs/vd_hmblck.c \
- libmpcodecs/vd_lzo.c \
- libmpcodecs/vd_mpegpes.c \
- libmpcodecs/vd_mtga.c \
- libmpcodecs/vd_null.c \
- libmpcodecs/vd_raw.c \
- libmpcodecs/vd_sgi.c \
- libmpcodecs/vf.c \
- libmpcodecs/vf_1bpp.c \
- libmpcodecs/vf_2xsai.c \
- libmpcodecs/vf_blackframe.c \
- libmpcodecs/vf_boxblur.c \
- libmpcodecs/vf_crop.c \
- libmpcodecs/vf_cropdetect.c \
- libmpcodecs/vf_decimate.c \
- libmpcodecs/vf_delogo.c \
- libmpcodecs/vf_denoise3d.c \
- libmpcodecs/vf_detc.c \
- libmpcodecs/vf_dint.c \
- libmpcodecs/vf_divtc.c \
- libmpcodecs/vf_down3dright.c \
- libmpcodecs/vf_dsize.c \
- libmpcodecs/vf_dvbscale.c \
- libmpcodecs/vf_eq.c \
- libmpcodecs/vf_eq2.c \
- libmpcodecs/vf_expand.c \
- libmpcodecs/vf_field.c \
- libmpcodecs/vf_fil.c \
- libmpcodecs/vf_filmdint.c \
- libmpcodecs/vf_flip.c \
- libmpcodecs/vf_format.c \
- libmpcodecs/vf_framestep.c \
- libmpcodecs/vf_halfpack.c \
- libmpcodecs/vf_harddup.c \
- libmpcodecs/vf_hqdn3d.c \
- libmpcodecs/vf_hue.c \
- libmpcodecs/vf_il.c \
- libmpcodecs/vf_ilpack.c \
- libmpcodecs/vf_ivtc.c \
- libmpcodecs/vf_kerndeint.c \
- libmpcodecs/vf_mirror.c \
- libmpcodecs/vf_noformat.c \
- libmpcodecs/vf_noise.c \
- libmpcodecs/vf_ow.c \
- libmpcodecs/vf_palette.c \
- libmpcodecs/vf_perspective.c \
- libmpcodecs/vf_phase.c \
- libmpcodecs/vf_pp7.c \
- libmpcodecs/vf_pullup.c \
- libmpcodecs/vf_rectangle.c \
- libmpcodecs/vf_remove_logo.c \
- libmpcodecs/vf_rgb2bgr.c \
- libmpcodecs/vf_rgbtest.c \
- libmpcodecs/vf_rotate.c \
- libmpcodecs/vf_sab.c \
- libmpcodecs/vf_scale.c \
- libmpcodecs/vf_smartblur.c \
- libmpcodecs/vf_softpulldown.c \
- libmpcodecs/vf_softskip.c \
- libmpcodecs/vf_swapuv.c \
- libmpcodecs/vf_telecine.c \
- libmpcodecs/vf_test.c \
- libmpcodecs/vf_tfields.c \
- libmpcodecs/vf_tile.c \
- libmpcodecs/vf_tinterlace.c \
- libmpcodecs/vf_unsharp.c \
- libmpcodecs/vf_vo.c \
- libmpcodecs/vf_yadif.c \
- libmpcodecs/vf_yuvcsp.c \
- libmpcodecs/vf_yuy2.c \
- libmpcodecs/vf_yvu9.c \
- libmpdemux/aac_hdr.c \
- libmpdemux/asfheader.c \
- libmpdemux/aviheader.c \
- libmpdemux/aviprint.c \
- libmpdemux/demuxer.c \
- libmpdemux/demux_aac.c \
- libmpdemux/demux_asf.c \
- libmpdemux/demux_audio.c \
- libmpdemux/demux_avi.c \
- libmpdemux/demux_demuxers.c \
- libmpdemux/demux_film.c \
- libmpdemux/demux_fli.c \
- libmpdemux/demux_lmlm4.c \
- libmpdemux/demux_mf.c \
- libmpdemux/demux_mkv.c \
- libmpdemux/demux_mov.c \
- libmpdemux/demux_mpg.c \
- libmpdemux/demux_nsv.c \
- libmpdemux/demux_pva.c \
- libmpdemux/demux_rawaudio.c \
- libmpdemux/demux_rawvideo.c \
- libmpdemux/demux_realaud.c \
- libmpdemux/demux_real.c \
- libmpdemux/demux_roq.c \
- libmpdemux/demux_smjpeg.c \
- libmpdemux/demux_ts.c \
- libmpdemux/demux_ty.c \
- libmpdemux/demux_ty_osd.c \
- libmpdemux/demux_viv.c \
- libmpdemux/demux_vqf.c \
- libmpdemux/demux_y4m.c \
- libmpdemux/ebml.c \
- libmpdemux/extension.c \
- libmpdemux/mf.c \
- libmpdemux/mp3_hdr.c \
- libmpdemux/mp_taglists.c \
- libmpdemux/mpeg_hdr.c \
- libmpdemux/mpeg_packetizer.c \
- libmpdemux/parse_es.c \
- libmpdemux/parse_mp4.c \
- libmpdemux/video.c \
- libmpdemux/yuv4mpeg.c \
- libmpdemux/yuv4mpeg_ratio.c \
- libvo/osd.c \
- libvo/sub.c \
- osdep/findfiles.c \
- osdep/$(GETCH) \
- osdep/$(TIMER) \
- stream/open.c \
- stream/stream.c \
- stream/stream_cue.c \
- stream/stream_file.c \
- stream/stream_mf.c \
- stream/stream_null.c \
- stream/url.c \
-
-SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c
-SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9) += stream/ai_alsa.c
-SRCS_COMMON-$(AUDIO_INPUT)-$(OSS) += stream/ai_oss.c
+SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
+SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
+SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
+SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
stream/cdinfo.c
@@ -356,6 +166,16 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
libdvdcss/libdvdcss.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
+
+SRCS_LIBMPEG2-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \
+ libmpeg2/motion_comp_alpha.c
+SRCS_LIBMPEG2-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \
+ libmpeg2/motion_comp_arm_s.S
+SRCS_LIBMPEG2-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
+ libmpeg2/motion_comp_altivec.c
+SRCS_LIBMPEG2-$(HAVE_MMX) += libmpeg2/idct_mmx.c \
+ libmpeg2/motion_comp_mmx.c
+SRCS_LIBMPEG2-$(HAVE_VIS) += libmpeg2/motion_comp_vis.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
libmpeg2/alloc.c \
libmpeg2/cpu_accel.c\
@@ -364,16 +184,9 @@ SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
libmpeg2/header.c \
libmpeg2/idct.c \
libmpeg2/motion_comp.c \
- libmpeg2/slice.c
-SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ALPHA) += libmpeg2/idct_alpha.c \
- libmpeg2/motion_comp_alpha.c
-SRCS_COMMON-$(LIBMPEG2)-$(ARCH_ARM) += libmpeg2/motion_comp_arm.c \
- libmpeg2/motion_comp_arm_s.S
-SRCS_COMMON-$(LIBMPEG2)-$(HAVE_ALTIVEC) += libmpeg2/idct_altivec.c \
- libmpeg2/motion_comp_altivec.c
-SRCS_COMMON-$(LIBMPEG2)-$(HAVE_MMX) += libmpeg2/idct_mmx.c \
- libmpeg2/motion_comp_mmx.c
-SRCS_COMMON-$(LIBMPEG2)-$(HAVE_VIS) += libmpeg2/motion_comp_vis.c
+ libmpeg2/slice.c \
+ $(SRCS_LIBMPEG2-yes)
+
SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
stream/stream_nemesi.c
SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
@@ -387,16 +200,20 @@ SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
stream/stream_live555.c
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
-SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
-SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
- mp3lib/dct64_3dnow.c
-SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
- mp3lib/dct64_k7.c
-SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c
-SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
-SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c
-SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE) += mp3lib/dct64_sse.c
+
+SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
+ mp3lib/dct64_3dnow.c
+SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
+ mp3lib/dct64_k7.c
+SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c
+SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
+ $(SRCS_MP3LIB-X86-yes)
+SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
+SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
+SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
+SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c \
+ $(SRCS_MP3LIB-yes)
+
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
libmpdemux/demux_mpc.c
SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
@@ -514,26 +331,198 @@ SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c
SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c
SRCS_COMMON-$(ZR) += libmpcodecs/vd_zrmjpeg.c \
libmpcodecs/vf_zrmjpeg.c
+SRCS_COMMON = asxparser.c \
+ codec-cfg.c \
+ cpudetect.c \
+ defaultopts.c \
+ edl.c \
+ find_sub.c \
+ fmt-conversion.c \
+ get_path.c \
+ m_config.c \
+ m_option.c \
+ m_struct.c \
+ mpcommon.c \
+ parser-cfg.c \
+ playtree.c \
+ playtreeparser.c \
+ spudec.c \
+ sub_cc.c \
+ subopt-helper.c \
+ subreader.c \
+ talloc.c \
+ vobsub.c \
+ libaf/af.c \
+ libaf/af_center.c \
+ libaf/af_channels.c \
+ libaf/af_comp.c \
+ libaf/af_delay.c \
+ libaf/af_dummy.c \
+ libaf/af_equalizer.c \
+ libaf/af_extrastereo.c \
+ libaf/af_format.c \
+ libaf/af_gate.c \
+ libaf/af_hrtf.c \
+ libaf/af_karaoke.c \
+ libaf/af_pan.c \
+ libaf/af_resample.c \
+ libaf/af_scaletempo.c \
+ libaf/af_sinesuppress.c \
+ libaf/af_stats.c \
+ libaf/af_sub.c \
+ libaf/af_surround.c \
+ libaf/af_sweep.c \
+ libaf/af_tools.c \
+ libaf/af_volnorm.c \
+ libaf/af_volume.c \
+ libaf/filter.c \
+ libaf/format.c \
+ libaf/reorder_ch.c \
+ libaf/window.c \
+ libmpcodecs/ad.c \
+ libmpcodecs/ad_alaw.c \
+ libmpcodecs/ad_dk3adpcm.c \
+ libmpcodecs/ad_dvdpcm.c \
+ libmpcodecs/ad_hwmpa.c \
+ libmpcodecs/ad_imaadpcm.c \
+ libmpcodecs/ad_msadpcm.c \
+ libmpcodecs/ad_msgsm.c \
+ libmpcodecs/ad_pcm.c \
+ libmpcodecs/dec_audio.c \
+ libmpcodecs/dec_video.c \
+ libmpcodecs/img_format.c \
+ libmpcodecs/mp_image.c \
+ libmpcodecs/native/xa_gsm.c \
+ libmpcodecs/pullup.c \
+ libmpcodecs/vd.c \
+ libmpcodecs/vd_hmblck.c \
+ libmpcodecs/vd_lzo.c \
+ libmpcodecs/vd_mpegpes.c \
+ libmpcodecs/vd_mtga.c \
+ libmpcodecs/vd_null.c \
+ libmpcodecs/vd_raw.c \
+ libmpcodecs/vd_sgi.c \
+ libmpcodecs/vf.c \
+ libmpcodecs/vf_1bpp.c \
+ libmpcodecs/vf_2xsai.c \
+ libmpcodecs/vf_blackframe.c \
+ libmpcodecs/vf_boxblur.c \
+ libmpcodecs/vf_crop.c \
+ libmpcodecs/vf_cropdetect.c \
+ libmpcodecs/vf_decimate.c \
+ libmpcodecs/vf_delogo.c \
+ libmpcodecs/vf_denoise3d.c \
+ libmpcodecs/vf_detc.c \
+ libmpcodecs/vf_dint.c \
+ libmpcodecs/vf_divtc.c \
+ libmpcodecs/vf_down3dright.c \
+ libmpcodecs/vf_dsize.c \
+ libmpcodecs/vf_dvbscale.c \
+ libmpcodecs/vf_eq.c \
+ libmpcodecs/vf_eq2.c \
+ libmpcodecs/vf_expand.c \
+ libmpcodecs/vf_field.c \
+ libmpcodecs/vf_fil.c \
+ libmpcodecs/vf_filmdint.c \
+ libmpcodecs/vf_flip.c \
+ libmpcodecs/vf_format.c \
+ libmpcodecs/vf_framestep.c \
+ libmpcodecs/vf_halfpack.c \
+ libmpcodecs/vf_harddup.c \
+ libmpcodecs/vf_hqdn3d.c \
+ libmpcodecs/vf_hue.c \
+ libmpcodecs/vf_il.c \
+ libmpcodecs/vf_ilpack.c \
+ libmpcodecs/vf_ivtc.c \
+ libmpcodecs/vf_kerndeint.c \
+ libmpcodecs/vf_mirror.c \
+ libmpcodecs/vf_noformat.c \
+ libmpcodecs/vf_noise.c \
+ libmpcodecs/vf_ow.c \
+ libmpcodecs/vf_palette.c \
+ libmpcodecs/vf_perspective.c \
+ libmpcodecs/vf_phase.c \
+ libmpcodecs/vf_pp7.c \
+ libmpcodecs/vf_pullup.c \
+ libmpcodecs/vf_rectangle.c \
+ libmpcodecs/vf_remove_logo.c \
+ libmpcodecs/vf_rgb2bgr.c \
+ libmpcodecs/vf_rgbtest.c \
+ libmpcodecs/vf_rotate.c \
+ libmpcodecs/vf_sab.c \
+ libmpcodecs/vf_scale.c \
+ libmpcodecs/vf_smartblur.c \
+ libmpcodecs/vf_softpulldown.c \
+ libmpcodecs/vf_softskip.c \
+ libmpcodecs/vf_swapuv.c \
+ libmpcodecs/vf_telecine.c \
+ libmpcodecs/vf_test.c \
+ libmpcodecs/vf_tfields.c \
+ libmpcodecs/vf_tile.c \
+ libmpcodecs/vf_tinterlace.c \
+ libmpcodecs/vf_unsharp.c \
+ libmpcodecs/vf_vo.c \
+ libmpcodecs/vf_yadif.c \
+ libmpcodecs/vf_yuvcsp.c \
+ libmpcodecs/vf_yuy2.c \
+ libmpcodecs/vf_yvu9.c \
+ libmpdemux/aac_hdr.c \
+ libmpdemux/asfheader.c \
+ libmpdemux/aviheader.c \
+ libmpdemux/aviprint.c \
+ libmpdemux/demuxer.c \
+ libmpdemux/demux_aac.c \
+ libmpdemux/demux_asf.c \
+ libmpdemux/demux_audio.c \
+ libmpdemux/demux_avi.c \
+ libmpdemux/demux_demuxers.c \
+ libmpdemux/demux_film.c \
+ libmpdemux/demux_fli.c \
+ libmpdemux/demux_lmlm4.c \
+ libmpdemux/demux_mf.c \
+ libmpdemux/demux_mkv.c \
+ libmpdemux/demux_mov.c \
+ libmpdemux/demux_mpg.c \
+ libmpdemux/demux_nsv.c \
+ libmpdemux/demux_pva.c \
+ libmpdemux/demux_rawaudio.c \
+ libmpdemux/demux_rawvideo.c \
+ libmpdemux/demux_realaud.c \
+ libmpdemux/demux_real.c \
+ libmpdemux/demux_roq.c \
+ libmpdemux/demux_smjpeg.c \
+ libmpdemux/demux_ts.c \
+ libmpdemux/demux_ty.c \
+ libmpdemux/demux_ty_osd.c \
+ libmpdemux/demux_viv.c \
+ libmpdemux/demux_vqf.c \
+ libmpdemux/demux_y4m.c \
+ libmpdemux/ebml.c \
+ libmpdemux/extension.c \
+ libmpdemux/mf.c \
+ libmpdemux/mp3_hdr.c \
+ libmpdemux/mp_taglists.c \
+ libmpdemux/mpeg_hdr.c \
+ libmpdemux/mpeg_packetizer.c \
+ libmpdemux/parse_es.c \
+ libmpdemux/parse_mp4.c \
+ libmpdemux/video.c \
+ libmpdemux/yuv4mpeg.c \
+ libmpdemux/yuv4mpeg_ratio.c \
+ libvo/osd.c \
+ libvo/sub.c \
+ osdep/findfiles.c \
+ osdep/$(GETCH) \
+ osdep/$(TIMER) \
+ stream/open.c \
+ stream/stream.c \
+ stream/stream_cue.c \
+ stream/stream_file.c \
+ stream/stream_mf.c \
+ stream/stream_null.c \
+ stream/url.c \
+ $(SRCS_COMMON-yes)
-SRCS_MPLAYER = mplayer.c \
- m_property.c \
- mp_fifo.c \
- mp_msg.c \
- mixer.c \
- parser-mpcmd.c \
- command.c \
- input/input.c \
- libao2/audio_out.c \
- libao2/ao_mpegpes.c \
- libao2/ao_null.c \
- libao2/ao_pcm.c \
- libvo/aspect.c \
- libvo/geometry.c \
- libvo/old_vo_wrapper.c \
- libvo/spuenc.c \
- libvo/video_out.c \
- libvo/vo_mpegpes.c \
- libvo/vo_null.c \
SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c
SRCS_MPLAYER-$(AA) += libvo/vo_aa.c
@@ -545,8 +534,8 @@ SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c
SRCS_MPLAYER-$(BL) += libvo/vo_bl.c
SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
-SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_macosx.c
-SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m
+SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
+SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
SRCS_MPLAYER-$(DART) += libao2/ao_dart.c
SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c
SRCS_MPLAYER-$(DGA) += libvo/vo_dga.c
@@ -672,19 +661,27 @@ SRCS_MPLAYER-$(XVR100) += libvo/vo_xvr100.c
SRCS_MPLAYER-$(YUV4MPEG) += libvo/vo_yuv4mpeg.c
SRCS_MPLAYER-$(ZR) += libvo/jpeg_enc.c libvo/vo_zr.c libvo/vo_zr2.c
-SRCS_MENCODER = mencoder.c \
- mp_msg-mencoder.c \
- parser-mecmd.c \
- xvid_vbr.c \
- libmpcodecs/ae.c \
- libmpcodecs/ae_pcm.c \
- libmpcodecs/ve.c \
- libmpcodecs/ve_raw.c \
- libmpdemux/muxer.c \
- libmpdemux/muxer_avi.c \
- libmpdemux/muxer_mpeg.c \
- libmpdemux/muxer_rawaudio.c \
- libmpdemux/muxer_rawvideo.c \
+SRCS_MPLAYER = mplayer.c \
+ m_property.c \
+ mp_fifo.c \
+ mp_msg.c \
+ mixer.c \
+ parser-mpcmd.c \
+ command.c \
+ input/input.c \
+ libao2/audio_out.c \
+ libao2/ao_mpegpes.c \
+ libao2/ao_null.c \
+ libao2/ao_pcm.c \
+ libvo/aspect.c \
+ libvo/geometry.c \
+ libvo/old_vo_wrapper.c \
+ libvo/spuenc.c \
+ libvo/video_out.c \
+ libvo/vo_mpegpes.c \
+ libvo/vo_null.c \
+ $(SRCS_MPLAYER-yes)
+
SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c
@@ -699,9 +696,21 @@ SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c
SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
-SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
-SRCS_MENCODER += $(SRCS_MENCODER-yes)
-SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
+SRCS_MENCODER = mencoder.c \
+ mp_msg-mencoder.c \
+ parser-mecmd.c \
+ xvid_vbr.c \
+ libmpcodecs/ae.c \
+ libmpcodecs/ae_pcm.c \
+ libmpcodecs/ve.c \
+ libmpcodecs/ve_raw.c \
+ libmpdemux/muxer.c \
+ libmpdemux/muxer_avi.c \
+ libmpdemux/muxer_mpeg.c \
+ libmpdemux/muxer_rawaudio.c \
+ libmpdemux/muxer_rawvideo.c \
+ $(SRCS_MENCODER-yes)
+
COMMON_LIBS-$(LIBAVFORMAT_A) += ffmpeg/libavformat/libavformat.a
COMMON_LIBS-$(LIBAVCODEC_A) += ffmpeg/libavcodec/libavcodec.a
@@ -789,14 +798,18 @@ DIRS = . \
ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
-PARTS = ffmpeg/libavcodec \
- ffmpeg/libavformat \
- ffmpeg/libavutil \
- ffmpeg/libpostproc \
- libswscale \
+ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2)))
+ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS))
+ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
+
+FFMPEGPARTS = ffmpeg/libavcodec \
+ ffmpeg/libavformat \
+ ffmpeg/libavutil \
+ ffmpeg/libpostproc \
+ libswscale \
-FFMPEGLIBS = $(foreach part, $(PARTS), $(part)/$(notdir $(part)).a)
-FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[choS]) ffmpeg/libavcodec/*/*.[choS] ffmpeg/libavcodec/*/*.asm
+FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(notdir $(part)).a)
+FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[choS] $(part)/*/*.[choS] $(part)/*/*.asm))
@@ -822,7 +835,7 @@ all: $(ALL_PRG-yes)
checkheaders: $(ALLHEADERS:.h=.ho)
dep depend: $(DEPS)
- for part in $(PARTS); do $(MAKE) -C $$part depend; done
+ for part in $(FFMPEGPARTS); do $(MAKE) -C $$part depend; done
# dummy to prevent default build rules from being used for FFMPEGFILES
$(FFMPEGFILES):
@@ -869,7 +882,7 @@ version.h: version.sh
# Make sure all generated header files are created.
codec-cfg.d codec-cfg.o: codecs.conf.h
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
-mpcommon.d mpcommon.o vobsub.d vobsub.o stream/stream_cddb.d stream/stream_cddb.o stream/network.d stream/network.o libmpdemux/muxer_avi.d libmpdemux/muxer_avi.o gui/win32/gui.d gui/win32/gui.o: version.h
+$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS)
libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
@@ -961,18 +974,16 @@ uninstall:
rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man)))
-ADD_ALL_EXESUFS = $(foreach exesuf,$(EXESUFS_ALL),$(1) $(1)$(exesuf))
-
clean:
- -rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir))))
- -rm -f $(foreach file,mplayer mencoder,$(call ADD_ALL_EXESUFS,$(file)))
+ -rm -f $(call ADD_ALL_DIRS,/*.o /*.a /*.ho /*~)
+ -rm -f $(call ADD_ALL_EXESUFS,mplayer mencoder)
distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean
-rm -rf DOCS/tech/doxygen
- -rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
+ -rm -f $(call ADD_ALL_DIRS,/*.d)
-rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \
version.h $(VIDIX_PCI_FILES) TAGS tags
- -rm -f $(foreach file,codec-cfg cpuinfo,$(call ADD_ALL_EXESUFS,$(file)))
+ -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)
doxygen:
doxygen DOCS/tech/Doxyfile
@@ -1016,7 +1027,7 @@ endif
tests: $(addsuffix $(EXESUF),$(TESTS))
testsclean:
- -rm -f $(foreach file,$(TESTS),$(call ADD_ALL_EXESUFS,$(file)))
+ -rm -f $(call ADD_ALL_EXESUFS,$(TESTS))
TOOLS = $(addprefix TOOLS/,alaw-gen asfinfo avi-fix avisubdump compare dump_mp4 movinfo netstream subrip vivodump)
@@ -1030,7 +1041,7 @@ tools: $(addsuffix $(EXESUF),$(TOOLS))
alltools: $(addsuffix $(EXESUF),$(ALLTOOLS))
toolsclean:
- -rm -f $(foreach file,$(ALLTOOLS),$(call ADD_ALL_EXESUFS,$(file)))
+ -rm -f $(call ADD_ALL_EXESUFS,$(ALLTOOLS))
-rm -f TOOLS/realcodecs/*.so.6.0
TOOLS/bmovl-test$(EXESUF): -lSDL_image