diff options
| author |  Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
| commit | 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (patch) | |
| tree | a083736322f89e8a0440f52c82c0922fc084798f /stream | |
| parent | 2993acdc3118ec01274cf357336760443bfce561 (diff) | |
| parent | 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 (diff) | |
Merge svn changes up to r26540
Conflicts:
Makefile
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/Makefile | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/stream/Makefile b/stream/Makefile deleted file mode 100644 index f69b5d350c..0000000000 --- a/stream/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = stream.a - -SRCS_COMMON = open.c \ - stream.c \ - stream_cue.c \ - stream_file.c \ - stream_mf.c \ - stream_null.c \ - url.c \ - -SRCS_COMMON-$(CDDA) += stream_cdda.c cdinfo.c -SRCS_COMMON-$(CDDB) += stream_cddb.c -SRCS_COMMON-$(DVBIN) += dvb_tune.c stream_dvb.c -SRCS_COMMON-$(DVDNAV) += stream_dvdnav.c -SRCS_COMMON-$(DVDREAD) += stream_dvd.c stream_dvd_common.c -SRCS_COMMON-$(FTP) += stream_ftp.c -SRCS_COMMON-$(LIBSMBCLIENT) += stream_smb.c -SRCS_COMMON-$(MPLAYER_NETWORK) += stream_netstream.c \ - asf_mmst_streaming.c \ - asf_streaming.c \ - cookies.c \ - http.c \ - network.c \ - pnm.c \ - rtp.c \ - udp.c \ - tcp.c \ - stream_rtp.c \ - stream_udp.c \ - realrtsp/asmrp.c \ - realrtsp/real.c \ - realrtsp/rmff.c \ - realrtsp/sdpplin.c \ - realrtsp/xbuffer.c \ - -SRCS_COMMON-$(NATIVE_RTSP) += stream_rtsp.c \ - freesdp/common.c \ - freesdp/errorlist.c \ - freesdp/parser.c \ - librtsp/rtsp.c \ - librtsp/rtsp_rtp.c \ - librtsp/rtsp_session.c \ - -SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c - -SRCS_COMMON-$(PVR) += stream_pvr.c -SRCS_COMMON-$(RADIO) += stream_radio.c -SRCS_COMMON-$(RADIO_CAPTURE) += audio_in.c -SRCS_COMMON-$(STREAM_CACHE) += cache2.c -SRCS_COMMON-$(STREAMING_LIVE555) += stream_livedotcom.c -SRCS_COMMON-$(TV) += stream_tv.c tv.c frequencies.c tvi_dummy.c -SRCS_COMMON-$(TV_BSDBT848) += tvi_bsdbt848.c -SRCS_COMMON-$(TV_DSHOW) += tvi_dshow.c -SRCS_COMMON-$(TV_TELETEXT) += tvi_vbi.c -SRCS_COMMON-$(TV_V4L1) += tvi_v4l.c audio_in.c -SRCS_COMMON-$(TV_V4L2) += tvi_v4l2.c audio_in.c -SRCS_COMMON-$(VCD) += stream_vcd.c -SRCS_COMMON-$(VSTREAM) += stream_vstream.c - -ifeq ($(AUDIO_INPUT),yes) -SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += ai_alsa.c -SRCS_COMMON-$(OSS) += ai_oss.c -endif - -include ../mpcommon.mak - -clean:: - rm -f realrtsp/*.o realrtsp/*.a realrtsp/*~ \ - librtsp/*.o librtsp/*.a librtsp/*~ \ - freesdp/*.o freesdp/*.a freesdp/*~ |