Be more patch-friendly

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15773 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 470 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index a5bc2b3b26..2bab2e442c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,40 @@ SUBDIRS += libdha vidix
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 endif
 
-SRCS_COMMON = cpudetect.c codec-cfg.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c m_config.c m_option.c parser-cfg.c m_struct.c edl.c
-SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c parser-mecmd.c
-SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c parser-mpcmd.c subopt-helper.c
+SRCS_COMMON = asxparser.c \
+              codec-cfg.c \
+              cpudetect.c \
+              edl.c \
+              find_sub.c \
+              m_config.c \
+              m_option.c \
+              m_struct.c \
+              parser-cfg.c \
+              playtree.c \
+              playtreeparser.c \
+              spudec.c \
+              sub_cc.c \
+              subreader.c \
+              vobsub.c \
+
+SRCS_MENCODER = mencoder.c \
+                mp_msg-mencoder.c \
+                $(SRCS_COMMON) \
+                divx4_vbr.c \
+                libvo/aclib.c \
+                libvo/font_load.c \
+                libvo/font_load_ft.c \
+                libvo/osd.c \
+                libvo/sub.c \
+                parser-mecmd.c \
+                xvid_vbr.c \
+
+SRCS_MPLAYER = mplayer.c \
+               mp_msg.c \
+               $(SRCS_COMMON) \
+               mixer.c \
+               parser-mpcmd.c \
+               subopt-helper.c \
 
 ifeq ($(UNRARLIB),yes)
 SRCS_COMMON += unrarlib.c
@@ -30,12 +61,76 @@ endif
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
-VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
-AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) $(POLYP_LIB)
-CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
-COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
+VO_LIBS = $(AA_LIB) \
+          $(X_LIB) \
+          $(SDL_LIB) \
+          $(GGI_LIB) \
+          $(MP1E_LIB) \
+          $(MLIB_LIB) \
+          $(SVGA_LIB) \
+          $(DIRECTFB_LIB) \
+          $(CACA_LIB) \
+
+AO_LIBS = $(ARTS_LIB) \
+          $(ESD_LIB) \
+          $(JACK_LIB) \
+          $(NAS_LIB) \
+          $(SGIAUDIO_LIB) \
+          $(POLYP_LIB) \
+
+CODEC_LIBS = $(AV_LIB) \
+             $(FAME_LIB) \
+             $(MAD_LIB) \
+             $(VORBIS_LIB) \
+             $(THEORA_LIB) \
+             $(FAAD_LIB) \
+             $(LIBLZO_LIB) \
+             $(DECORE_LIB) \
+             $(XVID_LIB) \
+             $(DTS_LIB) \
+             $(PNG_LIB) \
+             $(Z_LIB) \
+             $(JPEG_LIB) \
+             $(ALSA_LIB) \
+             $(XMMS_LIB) \
+             $(X264_LIB) \
+
+COMMON_LIBS = libmpcodecs/libmpcodecs.a \
+              $(W32_LIB) \
+              $(DS_LIB) \
+              libaf/libaf.a \
+              libmpdemux/libmpdemux.a \
+              input/libinput.a \
+              postproc/libswscale.a \
+              osdep/libosdep.a \
+              $(DVDREAD_LIB) \
+              $(CODEC_LIBS) \
+              $(FREETYPE_LIB) \
+              $(TERMCAP_LIB) \
+              $(CDPARANOIA_LIB) \
+              $(MPLAYER_NETWORK_LIB) \
+              $(WIN32_LIB) \
+              $(GIF_LIB) \
+              $(MACOSX_FRAMEWORKS) \
+              $(SMBSUPPORT_LIB) \
+              $(FRIBIDI_LIB) \
+              $(FONTCONFIG_LIB) \
+              $(ENCA_LIB) \
+
+CFLAGS = $(OPTFLAGS) -I. \
+         $(CACA_INC) \
+         $(CDPARANOIA_INC) \
+         $(DVB_INC) \
+         $(EXTRA_INC) \
+         $(FONTCONFIG_INC) \
+         $(FREETYPE_INC) \
+         $(FRIBIDI_INC) \
+         $(SDL_INC) \
+         $(X11_INC) \
+         $(XVID_INC) \
+
+#CFLAGS += -Wall
 
-CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
 ifeq ($(TOOLAME),yes)
 CFLAGS += $(TOOLAME_EXTRAFLAGS) 
 CODEC_LIBS += $(TOOLAME_LIB)
@@ -94,7 +189,18 @@ ifeq ($(MENCODER),yes)
 ALL_PRG += $(PRG_MENCODER)
 endif
 
-COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
+COMMON_DEPS = $(W32_DEP) \
+              $(DS_DEP) \
+              $(MP1E_DEP) \
+              $(AV_DEP) \
+              libmpdemux/libmpdemux.a \
+              libmpcodecs/libmpcodecs.a \
+              libao2/libao2.a \
+              osdep/libosdep.a \
+              postproc/libswscale.a \
+              input/libinput.a \
+              libvo/libvo.a \
+              libaf/libaf.a \
 
 ifeq ($(MP3LIB),yes)
 COMMON_DEPS += mp3lib/libMP3.a
@@ -248,11 +354,28 @@ ifeq ($(TARGET_WIN32),yes)
 OBJS_MPLAYER += osdep/mplayer-rc.o
 endif
 
+LIBS_MPLAYER = libvo/libvo.a \
+               libao2/libao2.a \
+               $(MENU_LIBS) \
+               $(VIDIX_LIBS) \
+               $(GUI_LIBS) \
+               $(COMMON_LIBS) \
+               $(GTK_LIBS) \
+               $(VO_LIBS) \
+               $(AO_LIBS) \
+               $(EXTRA_LIB)\
+               $(LIRC_LIB) \
+               $(LIRCC_LIB) \
+               $(STATIC_LIB) \
+               $(ARCH_LIB) \
+               $(I18NLIBS) \
+               $(MATH_LIB) \
+
 $(PRG):	$(MPLAYER_DEP)
     ifeq ($(TARGET_WIN32),yes)
 	windres -o osdep/mplayer-rc.o osdep/mplayer.rc
     endif
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(LIBS_MPLAYER)
 
 mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
 	winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
@@ -266,8 +389,19 @@ mplayer_wine.so:	$(MPLAYER_DEP)
 	$(CC) $(CFLAGS) -shared -Wl,-Bsymbolic -o mplayer_wine.so mplayer_wine.spec.c $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) -lwine $(ARCH_LIB) $(MATH_LIB)
 
 ifeq ($(MENCODER),yes)
+LIBS_MENCODER = libmpcodecs/libmpencoders.a \
+                $(ENCORE_LIB) \
+                $(COMMON_LIBS) \
+                $(EXTRA_LIB) \
+                $(MLIB_LIB) \
+                $(LIRC_LIB) \
+                $(LIRCC_LIB) \
+                $(ARCH_LIB) \
+                $(I18NLIBS) \
+                $(MATH_LIB) \
+
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER)
 endif
 
 codecs.conf.h: $(PRG_CFG) etc/codecs.conf
diff --git a/libaf/Makefile b/libaf/Makefile
index 1494c36d2e..65f2c434bd 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -2,10 +2,31 @@ include config.mak
 
 LIBNAME = libaf.a
 
-SRCS=af.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c \
-window.c filter.c af_volume.c af_equalizer.c af_tools.c af_comp.c af_gate.c \
-af_pan.c af_surround.c af_sub.c af_export.c af_volnorm.c af_extrastereo.c \
-af_lavcresample.c af_sweep.c af_hrtf.c format.c af_center.c $(OPTIONAL_SRCS)
+SRCS=af.c \
+     af_center.c \
+     af_channels.c \
+     af_comp.c \
+     af_delay.c \
+     af_dummy.c \
+     af_equalizer.c \
+     af_export.c \
+     af_extrastereo.c \
+     af_format.c \
+     af_gate.c \
+     af_hrtf.c \
+     af_lavcresample.c \
+     af_pan.c \
+     af_resample.c \
+     af_sub.c \
+     af_surround.c \
+     af_sweep.c \
+     af_tools.c \
+     af_volnorm.c \
+     af_volume.c \
+     filter.c \
+     format.c \
+     window.c \
+     $(OPTIONAL_SRCS) \
 
 OBJS=$(SRCS:.c=.o)
 
diff --git a/libao2/Makefile b/libao2/Makefile
index 1ba439e41d..80f8c05b7b 100644
--- a/libao2/Makefile
+++ b/libao2/Makefile
@@ -2,11 +2,24 @@ include config.mak
 
 LIBNAME = libao2.a
 
-SRCS=audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c $(OPTIONAL_SRCS)
+SRCS=audio_out.c \
+     ao_mpegpes.c \
+     ao_null.c \
+     ao_pcm.c \
+     $(OPTIONAL_SRCS) \
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. $(ARTS_INC) $(ESD_INC) $(JACK_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DVB_INC) $(POLYP_INC)
+CFLAGS  = $(OPTFLAGS) -I. -I.. \
+          $(ARTS_INC) \
+          $(DVB_INC) \
+          $(DXR2_INC) \
+          $(ESD_INC) \
+          $(EXTRA_INC) \
+          $(JACK_INC) \
+          $(POLYP_INC) \
+          $(SDL_INC) \
+          $(X11_INC) \
 
 .SUFFIXES: .c .o
 
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 8c5da23037..e29edaaca7 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -4,24 +4,154 @@ include ../config.mak
 LIBNAME = libmpcodecs.a
 LIBNAME2 = libmpencoders.a
 
-AUDIO_SRCS_LIB=ad_liba52.c ad_hwac3.c ad_mp3lib.c
-AUDIO_SRCS_NAT=ad_alaw.c ad_dk3adpcm.c ad_pcm.c ad_dvdpcm.c ad_imaadpcm.c ad_msadpcm.c ad_msgsm.c ad_ra1428.c
-AUDIO_SRCS_OPT=ad_acm.c ad_dshow.c ad_dmo.c ad_qtaudio.c ad_ffmpeg.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c ad_twin.c
+AUDIO_SRCS_LIB=ad_hwac3.c \
+               ad_liba52.c \
+               ad_mp3lib.c \
+
+AUDIO_SRCS_NAT=ad_alaw.c \
+               ad_dk3adpcm.c \
+               ad_dvdpcm.c \
+               ad_imaadpcm.c \
+               ad_msadpcm.c \
+               ad_msgsm.c \
+               ad_pcm.c \
+               ad_ra1428.c \
+
+AUDIO_SRCS_OPT=ad_acm.c \
+               ad_dmo.c \
+               ad_dshow.c \
+               ad_faad.c \
+               ad_ffmpeg.c \
+               ad_libdv.c \
+               ad_libmad.c \
+               ad_libvorbis.c \
+               ad_qtaudio.c \
+               ad_realaud.c \
+               ad_twin.c \
+
 AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT)
 
-VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
-VIDEO_SRCS_NAT=vd_null.c vd_raw.c vd_hmblck.c vd_mpegpes.c vd_mtga.c vd_sgi.c
-VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_zrmjpeg.c vd_xanim.c vd_xvid.c vd_xvid4.c vd_libdv.c vd_qtvideo.c vd_theora.c
+VIDEO_SRCS_LIB=vd_libmpeg2.c \
+               vd_lzo.c \
+               vd_nuv.c \
+
+VIDEO_SRCS_NAT=vd_hmblck.c \
+               vd_mpegpes.c \
+               vd_mtga.c \
+               vd_null.c \
+               vd_raw.c \
+               vd_sgi.c \
+
+VIDEO_SRCS_OPT=vd_divx4.c \
+               vd_dmo.c \
+               vd_dshow.c \
+               vd_ffmpeg.c\
+               vd_libdv.c \
+               vd_odivx.c \
+               vd_qtvideo.c \
+               vd_realvid.c \
+               vd_theora.c \
+               vd_vfw.c \
+               vd_vfwex.c \
+               vd_xanim.c \
+               vd_xvid4.c \
+               vd_xvid.c \
+               vd_zrmjpeg.c \
+
 VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
 
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_noformat.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c vf_fspp.c vf_yuvcsp.c vf_filmdint.c vf_kerndeint.c vf_rgbtest.c vf_qp.c vf_phase.c vf_divtc.c vf_harddup.c vf_softskip.c vf_remove_logo.c
+VFILTER_SRCS=vf.c \
+             pullup.c \
+             vf_1bpp.c \
+             vf_2xsai.c \
+             vf_bmovl.c \
+             vf_boxblur.c \
+             vf_crop.c \
+             vf_cropdetect.c \
+             vf_decimate.c \
+             vf_delogo.c \
+             vf_denoise3d.c \
+             vf_detc.c \
+             vf_dint.c \
+             vf_divtc.c \
+             vf_down3dright.c \
+             vf_dsize.c \
+             vf_dvbscale.c \
+             vf_eq2.c \
+             vf_eq.c \
+             vf_expand.c \
+             vf_field.c \
+             vf_fil.c \
+             vf_filmdint.c \
+             vf_flip.c \
+             vf_format.c \
+             vf_framestep.c \
+             vf_fspp.c \
+             vf_halfpack.c \
+             vf_harddup.c \
+             vf_hqdn3d.c \
+             vf_hue.c \
+             vf_il.c \
+             vf_ilpack.c \
+             vf_ivtc.c \
+             vf_kerndeint.c \
+             vf_lavc.c \
+             vf_lavcdeint.c \
+             vf_mirror.c \
+             vf_noformat.c \
+             vf_noise.c \
+             vf_palette.c \
+             vf_perspective.c \
+             vf_phase.c \
+             vf_pullup.c \
+             vf_qp.c \
+             vf_rectangle.c \
+             vf_remove_logo.c \
+             vf_rgb2bgr.c \
+             vf_rgbtest.c \
+             vf_rotate.c \
+             vf_sab.c \
+             vf_scale.c \
+             vf_smartblur.c \
+             vf_softpulldown.c \
+             vf_softskip.c \
+             vf_spp.c \
+             vf_swapuv.c \
+             vf_telecine.c \
+             vf_test.c \
+             vf_tfields.c \
+             vf_tile.c \
+             vf_tinterlace.c \
+             vf_unsharp.c \
+             vf_vo.c \
+             vf_yuvcsp.c \
+             vf_yuy2.c \
+             vf_yvu9.c \
+
 ifeq ($(HAVE_FFPOSTPROCESS),yes)
 VFILTER_SRCS += vf_pp.c
 endif
 
-ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_raw.c ve_libdv.c ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c ve_x264.c ae.c ae_pcm.c
-
-NATIVE_SRCS=native/RTjpegN.c native/minilzo.c native/nuppelvideo.c native/xa_gsm.c native/decode144.c native/decode288.c
+ENCODER_SRCS=ae.c \
+             ae_pcm.c \
+             ve.c \
+             ve_divx4.c \
+             ve_lavc.c \
+             ve_libdv.c \
+             ve_nuv.c \
+             ve_qtvideo.c \
+             ve_raw.c \
+             ve_vfw.c \
+             ve_x264.c \
+             ve_xvid4.c \
+             ve_xvid.c \
+
+NATIVE_SRCS=native/decode144.c \
+            native/decode288.c \
+            native/minilzo.c \
+            native/nuppelvideo.c \
+            native/RTjpegN.c \
+            native/xa_gsm.c \
 
 ifeq ($(FAME),yes)
 VFILTER_SRCS += vf_fame.c
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 97b118f8be..d216790ec9 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -3,37 +3,141 @@ LIBNAME = libmpdemux.a
 
 include ../config.mak
 
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c stream_smb.c stream_vstream.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c muxer_rawaudio.c demux_lavf.c demux_nsv.c demux_vqf.c stream_dvd.c stream_livedotcom.c demux_aac.c
+# Headers and header-dumpers
+SRCS  = mp3_hdr.c \
+        mpeg_hdr.c \
+        asfheader.c \
+        aviheader.c \
+        aviprint.c \
+
+# Core
+SRCS += cache2.c \
+        extension.c \
+        mf.c \
+        open.c \
+        url.c \
+        video.c \
+
+# Miscellaneous
+SRCS += cdda.c \
+        cddb.c \
+        cdinfo.c \
+        cue_read.c \
+        dvdnav_stream.c \
+        parse_es.c \
+        parse_mp4.c \
+        yuv4mpeg.c \
+        yuv4mpeg_ratio.c \
+
+# Stream readers/writers
+SRCS += stream.c \
+        stream_dvd.c \
+        stream_file.c \
+        stream_ftp.c \
+        stream_livedotcom.c \
+        stream_netstream.c \
+        stream_null.c \
+        stream_smb.c \
+        stream_vcd.c \
+        stream_vstream.c \
+
+# TV in
+SRCS += tv.c \
+        frequencies.c \
+        tvi_bsdbt848.c \
+        tvi_dummy.c \
+        tvi_v4l2.c \
+        tvi_v4l.c \
+
+# Audio in
+SRCS += audio_in.c \
+        ai_alsa1x.c \
+        ai_alsa.c \
+        ai_oss.c \
+
+# Demuxers
+SRCS += demuxer.c \
+        demux_aac.c \
+        demux_asf.c \
+        demux_audio.c \
+        demux_avi.c \
+        demux_demuxers.c \
+        demux_film.c \
+        demux_fli.c \
+        demux_gif.c \
+        demux_lavf.c \
+        demux_lmlm4.c \
+        demux_mf.c \
+        demux_mov.c \
+        demux_mpg.c \
+        demux_nsv.c \
+        demux_nuv.c \
+        demux_ogg.c \
+        demux_pva.c \
+        demux_rawaudio.c \
+        demux_rawdv.c \
+        demux_rawvideo.c \
+        demux_realaud.c \
+        demux_real.c \
+        demux_roq.c \
+        demux_smjpeg.c \
+        demux_ts.c \
+        demux_ty.c \
+        demux_ty_osd.c \
+        demux_viv.c \
+        demux_vqf.c \
+        demux_y4m.c \
+
 ifeq ($(XMMS_PLUGINS),yes)
 SRCS += demux_xmms.c
 endif 
-ifeq ($(MPLAYER_NETWORK),yes)
-SRCS += asf_streaming.c http.c network.c cookies.c asf_mmst_streaming.c pnm.c rtp.c
-SRCS += realrtsp/asmrp.c realrtsp/real.c realrtsp/rmff.c realrtsp/rtsp.c realrtsp/rtsp_session.c realrtsp/sdpplin.c realrtsp/xbuffer.c
-ifeq ($(STREAMING_LIVE_DOT_COM),yes)
-CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
-CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
-endif
-endif
-
-ifeq ($(DVBIN),yes)
-SRCS += dvbin.c
-SRCS += dvb_tune.c
-endif
-
 ifneq ($(W32_LIB),)
 SRCS += demux_avs.c
 endif
-
 ifeq ($(MATROSKA),yes)
 SRCS += demux_mkv.c ebml.c
 endif
 
+# Muxers
+SRCS += muxer.c \
+        muxer_avi.c \
+        muxer_mpeg.c \
+        muxer_rawaudio.c \
+        muxer_rawvideo.c \
+
 ifeq ($(CONFIG_LIBAVFORMAT),yes)
 LIBAV_INC = -I../libavcodec -I../libavformat
 SRCS += muxer_lavf.c
 endif
 
+ifeq ($(MPLAYER_NETWORK),yes)
+SRCS += asf_streaming.c \
+        http.c \
+        network.c \
+        cookies.c \
+        asf_mmst_streaming.c \
+        pnm.c \
+        rtp.c \
+
+SRCS += realrtsp/asmrp.c \
+        realrtsp/real.c \
+        realrtsp/rmff.c \
+        realrtsp/rtsp.c \
+        realrtsp/rtsp_session.c \
+        realrtsp/sdpplin.c \
+        realrtsp/xbuffer.c \
+
+ifeq ($(STREAMING_LIVE_DOT_COM),yes)
+CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp
+CPLUSPLUSINCLUDE = $(LIVE_INCLUDES)
+endif
+endif
+
+ifeq ($(DVBIN),yes)
+SRCS += dvbin.c
+SRCS += dvb_tune.c
+endif
+
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
 INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
diff --git a/libvo/Makefile b/libvo/Makefile
index bb9a733049..3906376371 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -3,7 +3,21 @@ include config.mak
 
 LIBNAME = libvo.a
 
-SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
+SRCS=aclib.c \
+     aspect.c \
+     font_load.c \
+     font_load_ft.c \
+     geometry.c \
+     gtf.c \
+     osd.c \
+     spuenc.c \
+     sub.c \
+     video_out.c \
+     vo_mpegpes.c \
+     vo_null.c \
+     vo_yuv4mpeg.c \
+     $(OPTIONAL_SRCS) \
+
 OBJS_TEMP=$(basename $(SRCS))
 OBJS=$(OBJS_TEMP:%=%.o)
 
@@ -11,7 +25,16 @@ ifeq ($(VIDIX),yes)
 SRCS += vosub_vidix.c
 endif
 
-CFLAGS  = $(OPTFLAGS) -I. -I.. -I../osdep $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall
+CFLAGS  = $(OPTFLAGS) -I. -I.. -I../osdep \
+          $(FREETYPE_INC) \
+          $(SDL_INC) \
+          $(X11_INC) \
+          $(EXTRA_INC) \
+          $(DXR2_INC) \
+          $(DIRECTFB_INC) \
+          -DMPG12PLAY \
+
+#CFLAGS += -Wall
 
 .SUFFIXES: .c .o .m