[MPlayer-cvslog] r29208 - trunk/Makefile
diego
subversion at mplayerhq.hu
Mon Apr 20 16:02:40 CEST 2009
Author: diego
Date: Mon Apr 20 16:02:40 2009
New Revision: 29208
Log:
Move non-conditional SRCS lists below the conditional parts. This allows
simplifying the addition of the conditional parts to the SRCS lists.
Modified:
trunk/Makefile
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Mon Apr 20 15:52:14 2009 (r29207)
+++ trunk/Makefile Mon Apr 20 16:02:40 2009 (r29208)
@@ -33,194 +33,6 @@ LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
$(COMMON_LDFLAGS) \
-SRCS_COMMON = asxparser.c \
- codec-cfg.c \
- cpudetect.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 \
- 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/$(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_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
@@ -519,25 +331,195 @@ SRCS_COMMON-$(XMMS_PLUGINS) +=
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 \
+ 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 \
+ 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/$(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/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
@@ -676,19 +658,26 @@ SRCS_MPLAYER-$(XVR100) += libvo/v
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/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
@@ -703,9 +692,21 @@ SRCS_MENCODER-$(WIN32DLL) += lib
SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
-SRCS_COMMON += $(SRCS_COMMON-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) += libavformat/libavformat.a
COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
More information about the MPlayer-cvslog
mailing list