[MPlayer-cvslog] r19293 - in trunk/stream: Makefile cdinfo.c

[diego]

Author: diego
Date: Wed Aug  2 13:22:11 2006
New Revision: 19293

Modified:
   trunk/stream/Makefile
   trunk/stream/cdinfo.c

Log:
Move conditional compilation of cdinfo.c to the build system.
patch by Emanuele Giaquinta, emanuele . giaquinta #at# gmail . com


Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Wed Aug  2 13:22:11 2006
@@ -13,11 +13,10 @@
 endif
 
 # Miscellaneous
-SRCS += cdinfo.c \
-        cue_read.c \
+SRCS += cue_read.c \
 
 ifeq ($(CDDA),yes)
-SRCS += stream_cdda.c
+SRCS += stream_cdda.c cdinfo.c
   ifeq ($(MPLAYER_NETWORK),yes)
   SRCS += stream_cddb.c
   endif

Modified: trunk/stream/cdinfo.c
==============================================================================
--- trunk/stream/cdinfo.c	(original)
+++ trunk/stream/cdinfo.c	Wed Aug  2 13:22:11 2006
@@ -6,8 +6,6 @@
 
 #include "config.h"
 
-#if defined(HAVE_CDDA) 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -133,5 +131,3 @@
 	}
 	printf("================ CD INFO ===  end  =========\n");
 }
-
-#endif