diff options
| -rw-r--r-- | .cvsignore | 19 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | man/.cvsignore | 2 | ||||
| -rw-r--r-- | src/.cvsignore | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/draglock.c | 2 | ||||
| -rw-r--r-- | src/emuMB.c | 2 | ||||
| -rw-r--r-- | src/emuWheel.c | 2 | ||||
| -rw-r--r-- | src/evdev.c | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 1 |
12 files changed, 24 insertions, 44 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index fb1befd..0000000 --- a/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -Makefile -Makefile.in -*.la -*.lo -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 @@ -22,6 +22,7 @@ missing *.lo *.la stamp-h1 -*.bz2 -*.gz +xf86-input-evdev-*.tar.* *.pc +*~ +tags diff --git a/Makefile.am b/Makefile.am index d8397f8..3a59a65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,14 +29,13 @@ SUBDIRS = src man include $(test_dir) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-evdev.pc -EXTRA_DIST = ChangeLog autogen.sh +EXTRA_DIST = ChangeLog MAINTAINERCLEANFILES=ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \ - (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 4ba5a8a..809799f 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -DRIVER_NAME=evdev -AC_SUBST([DRIVER_NAME]) - +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -72,19 +73,22 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" +sdkdir=$(pkg-config --variable=sdkdir xorg-server | + sed -e 's@/usr/include@$(includedir)@') AC_SUBST(sdkdir) -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) - # Checks for libraries. # Checks for header files. AC_HEADER_STDC +DRIVER_NAME=evdev +AC_SUBST([DRIVER_NAME]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/man/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 9730646..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/src/Makefile.am b/src/Makefile.am index 16cec14..2b6c800 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,8 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +AM_CFLAGS = $(XORG_CFLAGS) + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ diff --git a/src/draglock.c b/src/draglock.c index 8e97b0d..414166f 100644 --- a/src/draglock.c +++ b/src/draglock.c @@ -217,7 +217,7 @@ EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value) * for the pair. 0 disables a pair. * i.e. to set bt 3 to draglock button 1, supply 0,0,1 */ -int +static int EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly) { diff --git a/src/emuMB.c b/src/emuMB.c index 028d27f..41d0d2c 100644 --- a/src/emuMB.c +++ b/src/emuMB.c @@ -352,7 +352,7 @@ EvdevMBEmuEnable(InputInfoPtr pInfo, BOOL enable) #ifdef HAVE_PROPERTIES -int +static int EvdevMBEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly) { diff --git a/src/emuWheel.c b/src/emuWheel.c index 488a6a2..7d3eb24 100644 --- a/src/emuWheel.c +++ b/src/emuWheel.c @@ -311,7 +311,7 @@ EvdevWheelEmuPreInit(InputInfoPtr pInfo) } #ifdef HAVE_PROPERTIES -int +static int EvdevWheelEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly) { diff --git a/src/evdev.c b/src/evdev.c index 1356411..e8c1e2c 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -120,7 +120,7 @@ static Atom prop_label = 0; /* All devices the evdev driver has allocated and knows about. * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK) * cannot be used by evdev, leaving us with a space of 2 at the end. */ -static EvdevPtr evdev_devices[MAXDEVICES] = {0}; +static EvdevPtr evdev_devices[MAXDEVICES] = {NULL}; static int EvdevGetMajorMinor(InputInfoPtr pInfo) @@ -1495,7 +1495,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->reverse_conversion_proc = NULL; pInfo->dev = NULL; pInfo->private_flags = 0; - pInfo->always_core_feedback = 0; + pInfo->always_core_feedback = NULL; pInfo->conf_idev = dev; if (!(pEvdev = xcalloc(sizeof(EvdevRec), 1))) diff --git a/test/Makefile.am b/test/Makefile.am index 09a1979..94e1e44 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,6 +17,7 @@ # THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +AM_CFLAGS = $(XORG_CFLAGS) noinst_PROGRAMS=fakedev btn0 absrel abs dummy |