# HG changeset patch # User diego # Date 1164628849 0 # Node ID c5b4fa82386502178e609ef41989689a3e8e3133 # Parent d4f6e0e5de2e9afd638b4a327fd27c1441f98626 Untangle dependencies that are handled by configure. diff -r d4f6e0e5de2e -r c5b4fa823865 stream/Makefile --- a/stream/Makefile Mon Nov 27 11:48:29 2006 +0000 +++ b/stream/Makefile Mon Nov 27 12:00:49 2006 +0000 @@ -41,11 +41,11 @@ SRCS += stream_smb.c endif ifeq ($(MPLAYER_NETWORK),yes) - SRCS += stream_netstream.c +SRCS += stream_netstream.c +endif ifeq ($(STREAMING_LIVE555),yes) SRCS += stream_livedotcom.c endif -endif ifeq ($(VSTREAM),yes) SRCS += stream_vstream.c endif @@ -53,15 +53,16 @@ # TV in ifeq ($(TV),yes) SRCS += stream_tv.c tv.c frequencies.c tvi_dummy.c +endif ifeq ($(TV_BSDBT848),yes) SRCS += tvi_bsdbt848.c endif ifeq ($(TV_V4L2),yes) SRCS += tvi_v4l2.c audio_in.c + endif ifeq ($(PVR),yes) SRCS += stream_pvr.c endif - endif ifeq ($(TV_V4L1),yes) SRCS += tvi_v4l.c audio_in.c endif @@ -76,11 +77,11 @@ SRCS += ai_oss.c endif endif -endif # Radio in ifeq ($(RADIO),yes) SRCS += stream_radio.c +endif ifeq ($(RADIO_CAPTURE),yes) SRCS += audio_in.c ifeq ($(ALSA1X),yes) @@ -93,7 +94,6 @@ SRCS += ai_oss.c endif endif -endif ifeq ($(MPLAYER_NETWORK),yes) SRCS += asf_streaming.c \