From af06a4425b1434778e1b9ab1edfa33ffe0f9497e Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 12 Sep 2006 08:42:01 +0000
Subject: Move conditional compilation to the build system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19807 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 input/Makefile   | 9 ++++++++-
 input/joystick.c | 4 ----
 input/lirc.c     | 4 ----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'input')

diff --git a/input/Makefile b/input/Makefile
index dcd64df93f..f829b883bf 100644
--- a/input/Makefile
+++ b/input/Makefile
@@ -3,7 +3,14 @@ include ../config.mak
 
 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)
diff --git a/input/joystick.c b/input/joystick.c
index d9d807b60f..cd77dd42d5 100644
--- a/input/joystick.c
+++ b/input/joystick.c
@@ -1,8 +1,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_JOYSTICK
-
 #include "joystick.h"
 #include "input.h"
 
@@ -163,5 +161,3 @@ int mp_input_joystick_read(int fd) {
 }
 
 #endif
-
-#endif
diff --git a/input/lirc.c b/input/lirc.c
index 411561bc52..9694e64367 100644
--- a/input/lirc.c
+++ b/input/lirc.c
@@ -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 @@ mp_input_lirc_close(int fd) {
   lirc_freeconfig(lirc_config);
   lirc_deinit();
 }
-
-#endif
-- 
cgit v1.2.3