diff Makefile @ 27397:d47744b95b78

Give a CONFIG_ prefix to preprocessor directives that lacked one and change arbitrary prefixes to CONFIG_.
author diego
date Thu, 07 Aug 2008 12:20:50 +0000
parents a0c602e0caf3
children eb9b0b46009d
line wrap: on
line diff
--- a/Makefile	Thu Aug 07 11:58:37 2008 +0000
+++ b/Makefile	Thu Aug 07 12:20:50 2008 +0000
@@ -382,7 +382,7 @@
 SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX)    += mp3lib/decode_mmx.c
 SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE)    += mp3lib/dct64_sse.c
-SRCS_COMMON-$(MPLAYER_NETWORK)       += stream/stream_netstream.c \
+SRCS_COMMON-$(NETWORK)               += stream/stream_netstream.c \
                                         stream/asf_mmst_streaming.c \
                                         stream/asf_streaming.c \
                                         stream/cookies.c \
@@ -430,7 +430,7 @@
                                         libmpcodecs/vd_realvid.c
 SRCS_COMMON-$(SPEEX)                 += libmpcodecs/ad_speex.c
 SRCS_COMMON-$(STREAM_CACHE)          += stream/cache2.c
-SRCS_COMMON-$(STREAMING_LIVE555)     += libmpdemux/demux_rtp.cpp \
+SRCS_COMMON-$(LIVE555)               += libmpdemux/demux_rtp.cpp \
                                         libmpdemux/demux_rtp_codec.cpp \
                                         stream/stream_live555.c \