diff options
| author | Kevin E Martin <kem@kem.org> | 2005-07-13 02:21:03 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-07-13 02:21:03 +0000 |
| commit | 0a57f004ac08227599eff1aaa5ed26a7b342d385 (patch) | |
| tree | 6f82b356699a9aeeab3eb9222dc40f98d057105a | |
| parent | 4555a073c2558bfcc02f922883434b73570c4258 (diff) | |
Update all input drivers to pass distcheck
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index fc1ed59..ce99ae6 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ AC_INIT([xf86-input-spaceorb], xf86-input-spaceorb) AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -35,7 +36,6 @@ DRIVER_NAME=spaceorb AC_SUBST([DRIVER_NAME]) AM_CONFIG_HEADER([config.h]) -AC_CONFIG_AUX_DIR(.) # Checks for programs. AC_PROG_LIBTOOL @@ -62,13 +62,12 @@ AH_TOP([#include "xorg-server.h"]) #fi # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server) +PKG_CHECK_MODULES(XORG, xorg-server xproto) inputdir=$(pkg-config --variable=moduledir xorg-server)/input AC_SUBST([inputdir]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src' -INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' AC_SUBST([CFLAGS]) AC_SUBST([INCLUDES]) diff --git a/src/Makefile.am b/src/Makefile.am index 2221bbc..5ff68eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,4 +28,4 @@ @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ -@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c +@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h |