From 2cde4a91c25a34b2ffe10a82f49cf8f218ac5292 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 ++---
 src/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 07009f0..e35f159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AC_INIT([xf86-input-hyperpen],
         xf86-input-hyperpen)
 
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
@@ -35,7 +36,6 @@ DRIVER_NAME=hyperpen
 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..dbb7ae0 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 = xf86HyperPen.c
-- 
cgit v1.2.3