From 9bf5e9b174d7c1e9c0633f0e170e5c15ba39c80f Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 13 Jul 2005 02:20:59 +0000
Subject: Update all input drivers to pass distcheck

---
 configure.ac    | 5 ++---
 man/Makefile.am | 2 +-
 src/Makefile.am | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7cf73e5..ab8dfe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_INIT([xf86-input-elographics],
         xf86-input-elographics)
 
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
@@ -35,7 +36,6 @@ DRIVER_NAME=elographics
 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/man/Makefile.am b/man/Makefile.am
index 037c760..9ecb395 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,4 +18,4 @@
 #  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.
 
-man_MANS = @DRIVER_NAME@.4
+dist_man_MANS = @DRIVER_NAME@.4
diff --git a/src/Makefile.am b/src/Makefile.am
index 2221bbc..c1d44bf 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 = xf86Elo.c
-- 
cgit v1.2.3