summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 12:00:49 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-27 12:00:49 +0000
commit11cbd174c70b81c561e39736e91366a8816ed2ee (patch)
treea467995509c6855b7f328f77f2633d5d87a78acf
parentc6ed0d26bb42885c0ee3231d5ce20cbfd098d193 (diff)
downloadmpv-11cbd174c70b81c561e39736e91366a8816ed2ee.tar.bz2
mpv-11cbd174c70b81c561e39736e91366a8816ed2ee.tar.xz
Untangle dependencies that are handled by configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21317 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/stream/Makefile b/stream/Makefile
index 816ac871e3..f0ef1b0407 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -41,11 +41,11 @@ ifeq ($(LIBSMBCLIENT),yes)
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 @@ endif
# 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 += stream_tv.c tv.c frequencies.c tvi_dummy.c
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 += stream_radio.c
SRCS += ai_oss.c
endif
endif
-endif
ifeq ($(MPLAYER_NETWORK),yes)
SRCS += asf_streaming.c \