diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/linux/input-event-codes.h (renamed from libwacom/input-event-codes.h) | 0 | ||||
| -rw-r--r-- | libwacom/Makefile.am | 8 | ||||
| -rw-r--r-- | libwacom/libwacom-database.c | 2 | ||||
| -rw-r--r-- | libwacom/libwacom.c | 13 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/test-load.c | 2 |
7 files changed, 13 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 5fe901b..46fd4af 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,6 @@ AC_CHECK_PROG(HAVE_DOXYGEN, [doxygen], [yes], [no]) AM_CONDITIONAL(HAVE_DOXYGEN, test "x$HAVE_DOXYGEN" = xyes) PKG_CHECK_MODULES(GLIB, glib-2.0 gudev-1.0) -AC_CHECK_HEADERS(linux/input.h) PKG_CHECK_MODULES(LIBXML, libxml-2.0 glib-2.0, HAVE_LIBXML="yes", HAVE_LIBXML="no") AM_CONDITIONAL(HAVE_LIBXML, test x$HAVE_LIBXML = xyes) diff --git a/libwacom/input-event-codes.h b/include/linux/input-event-codes.h index f5a8d96..f5a8d96 100644 --- a/libwacom/input-event-codes.h +++ b/include/linux/input-event-codes.h diff --git a/libwacom/Makefile.am b/libwacom/Makefile.am index 7bdbd61..5a423db 100644 --- a/libwacom/Makefile.am +++ b/libwacom/Makefile.am @@ -1,9 +1,13 @@ lib_LTLIBRARIES=libwacom.la -AM_CPPFLAGS = $(GLIB_CFLAGS) -DDATADIR="\"$(datadir)/libwacom\"" -DG_LOG_DOMAIN="\"$(PACKAGE)\"" +AM_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + -DDATADIR="\"$(datadir)/libwacom\"" \ + -DG_LOG_DOMAIN="\"$(PACKAGE)\"" \ + -I$(top_srcdir)/include libwacom_la_SOURCES = \ - input-event-codes.h \ + $(top_srcdir)/include/linux/input-event-codes.h \ libwacom.h \ libwacomint.h \ libwacom.c \ diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index 5df961a..45b685b 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c @@ -29,7 +29,7 @@ #endif #include "libwacomint.h" -#include "input-event-codes.h" +#include <linux/input-event-codes.h> #include <assert.h> #include <glib.h> diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c index b0723e8..f1609a6 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c @@ -36,18 +36,7 @@ #include <string.h> #include <gudev/gudev.h> -#ifdef HAVE_LINUX_INPUT_H -#include <linux/input.h> -#endif - -/* Defined in linux/input.h but older versions may be missing these definitions */ -#ifndef INPUT_PROP_POINTER -#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ -#endif - -#ifndef INPUT_PROP_DIRECT -#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ -#endif +#include <linux/input-event-codes.h> static const WacomDevice * libwacom_get_device(const WacomDeviceDatabase *db, const char *match) diff --git a/test/Makefile.am b/test/Makefile.am index b23bb34..81989c3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,10 @@ noinst_PROGRAMS=test-load test-dbverify test-tablet-validity TESTS=$(noinst_PROGRAMS) -AM_CPPFLAGS=-I$(top_srcdir)/libwacom -DTOPSRCDIR="\"$(abs_top_srcdir)\"" +AM_CPPFLAGS= \ + -I$(top_srcdir)/libwacom \ + -I$(top_srcdir)/include \ + -DTOPSRCDIR="\"$(abs_top_srcdir)\"" test_load_SOURCES = test-load.c test_load_LDADD=$(top_builddir)/libwacom/libwacom.la diff --git a/test/test-load.c b/test/test-load.c index 3afaa43..0153b68 100644 --- a/test/test-load.c +++ b/test/test-load.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "input-event-codes.h" +#include <linux/input-event-codes.h> #include <stdio.h> #include <stdlib.h> |