Mercurial > mplayer.hg
changeset 19801:133f4d2f84c5
Move conditional compilation to the build system.
| author | diego |
|---|---|
| date | Tue, 12 Sep 2006 08:42:01 +0000 |
| parents | dfb8d242987b |
| children | f1655de446c4 |
| files | configure input/Makefile input/joystick.c input/lirc.c |
| diffstat | 4 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Sep 12 08:28:48 2006 +0000 +++ b/configure Tue Sep 12 08:42:01 2006 +0000 @@ -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
--- a/input/Makefile Tue Sep 12 08:28:48 2006 +0000 +++ b/input/Makefile Tue Sep 12 08:42:01 2006 +0000 @@ -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)
--- a/input/joystick.c Tue Sep 12 08:28:48 2006 +0000 +++ b/input/joystick.c Tue Sep 12 08:42:01 2006 +0000 @@ -1,8 +1,6 @@ #include "config.h" -#ifdef HAVE_JOYSTICK - #include "joystick.h" #include "input.h" @@ -163,5 +161,3 @@ } #endif - -#endif
--- a/input/lirc.c Tue Sep 12 08:28:48 2006 +0000 +++ b/input/lirc.c Tue Sep 12 08:42:01 2006 +0000 @@ -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