[MPlayer-cvslog] CVS: main/libmpdemux Makefile,1.93,1.94

[Tobias Diedrich CVS]

CVS change done by Tobias Diedrich CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv30062/libmpdemux

Modified Files:
	Makefile 
Log Message:
Be more patch-friendly

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile	19 Jun 2005 09:12:43 -0000	1.93
+++ Makefile	19 Jun 2005 22:52:55 -0000	1.94
@@ -3,37 +3,141 @@
 
 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)