[MPlayer-cvslog] r19807 - in trunk: configure input/Makefile input/joystick.c input/lirc.c

[diego]

Author: diego
Date: Tue Sep 12 10:42:01 2006
New Revision: 19807

Modified:
   trunk/configure
   trunk/input/Makefile
   trunk/input/joystick.c
   trunk/input/lirc.c

Log:
Move conditional compilation to the build system.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Sep 12 10:42:01 2006
@@ -7428,6 +7428,8 @@
 
 # input/demuxer/codecs
 TERMCAP_LIB = $_ld_termcap
+JOYSTICK = $_joystick
+LIRC = $_lirc
 LIRC_LIB = $_ld_lirc
 LIRCC_LIB = $_ld_lircc
 TV = $_tv

Modified: trunk/input/Makefile
==============================================================================
--- trunk/input/Makefile	(original)
+++ trunk/input/Makefile	Tue Sep 12 10:42:01 2006
@@ -3,7 +3,14 @@
 
 LIBNAME = libinput.a
 
-SRCS=input.c joystick.c lirc.c 
+SRCS=input.c
+ifeq ($(JOYSTICK),yes)
+SRCS += joystick.c
+endif
+ifeq ($(LIRC),yes)
+SRCS += lirc.c
+endif
+
 OBJS=$(SRCS:.c=.o)
 
 CFLAGS  = -I. -I.. $(OPTFLAGS)

Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c	(original)
+++ trunk/input/joystick.c	Tue Sep 12 10:42:01 2006
@@ -1,8 +1,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_JOYSTICK
-
 #include "joystick.h"
 #include "input.h"
 
@@ -163,5 +161,3 @@
 }
 
 #endif
-
-#endif

Modified: trunk/input/lirc.c
==============================================================================
--- trunk/input/lirc.c	(original)
+++ trunk/input/lirc.c	Tue Sep 12 10:42:01 2006
@@ -1,8 +1,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_LIRC
-
 #include <lirc/lirc_client.h>
 #include <errno.h>
 #include <stdio.h>
@@ -115,5 +113,3 @@
   lirc_freeconfig(lirc_config);
   lirc_deinit();
 }
-
-#endif