diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 22:02:06 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-27 22:02:06 +0000 |
commit | a96d2ce940af27a47e34c3c7c20270a3e158a196 (patch) | |
tree | 8a935a6316146b8dd1f85591051bfc44406da0d0 | |
parent | 6157b0b3ea1d5d7a03ecd814a17689a46b17d7e8 (diff) | |
download | mpv-a96d2ce940af27a47e34c3c7c20270a3e158a196.tar.bz2 mpv-a96d2ce940af27a47e34c3c7c20270a3e158a196.tar.xz |
Add a config.mak variable for CDDB.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21342 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | stream/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -5226,6 +5226,7 @@ if test "$_cdparanoia" = yes ; then _cdda='yes' _ld_extra="$_ld_extra -lcdda_interface -lcdda_paranoia" openbsd && _ld_extra="$_ld_extra -lutil" + test $_network = yes && _cddb=yes fi echores "$_cdparanoia" @@ -7434,6 +7435,7 @@ CONFIG_DTS = $_libdts MPLAYER = $_mplayer MENCODER = $_mencoder CDDA = $_cdda +CDDB = $_cddb BITMAP_FONT = $_bitmap_font FREETYPE = $_freetype CONFIG_ASS = $_ass diff --git a/stream/Makefile b/stream/Makefile index b6a080ea37..9c5e7d7d8c 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -12,6 +12,7 @@ SRCS += open.c \ url.c \ SRCS-$(CDDA) += stream_cdda.c cdinfo.c +SRCS-$(CDDB) += stream_cddb.c SRCS-$(DVBIN) += dvb_tune.c stream_dvb.c SRCS-$(DVDNAV) += stream_dvdnav.c SRCS-$(DVDREAD) += stream_dvd.c @@ -55,9 +56,6 @@ SRCS-$(VCD) += stream_vcd.c SRCS-$(VSTREAM) += stream_vstream.c #FIXME: These should have variables assigned in configure. -ifeq ($(CDDA),yes) -SRCS-$(MPLAYER_NETWORK) += stream_cddb.c -endif ifeq ($(TV_V4L),yes) SRCS-$(ALSA1X) += ai_alsa1x.c SRCS-$(ALSA9) += ai_alsa.c |