summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-17 13:14:53 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:44 +0200
commit578ad534b3d57eac33573e5bf576a819e2ba2303 (patch)
tree596e69d3a6cd0ed93fcccf98a8b744423b3ae668 /Makefile
parentfea2d4dd45c691f3fd7c79144e63c0d471d37f51 (diff)
downloadmpv-578ad534b3d57eac33573e5bf576a819e2ba2303.tar.bz2
mpv-578ad534b3d57eac33573e5bf576a819e2ba2303.tar.xz
configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 060bb5d3ab..dd94f6db11 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
-SRCS_COMMON-$(NETWORK) += stream/stream_netstream.c \
+SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \
stream/asf_mmst_streaming.c \
stream/asf_streaming.c \
stream/cookies.c \