From caa4aaafe48fce11f6826ba2d0b8f1ff4f8e49cf Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Mon, 2 Aug 2010 01:49:03 +0200
Subject: Remove erroneous dependency on xorg macros

This package has no external dependencies and should not depend
on the xorg macros. This patch removes the dependency, adds a tailored
INSTALL file, and uses git to generate the ChangeLog.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 .gitignore   |  1 -
 INSTALL      | 25 +++++++++++++++++++++++++
 Makefile.am  |  2 +-
 autogen.sh   |  2 --
 configure.ac |  7 +------
 5 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 INSTALL

diff --git a/.gitignore b/.gitignore
index 1961de8..132e096 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ configure
 configure.scan
 depcomp
 .deps/
-INSTALL
 install-sh
 .libs/
 libtool
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..56bcf90
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,25 @@
+mtdev - Multitouch Protocol Translation Library (MIT license)
+
+To build, you need to have the autoconf and libtool packages
+installed. Then, do
+
+   ./autogen.sh
+   ./configure
+   make
+
+To test an MT device at /dev/input/eventX, do
+
+   sudo ./test/mtdev-test /dev/input/eventX
+
+You should be able to see MT events in the terminal. After five
+seconds of inactivity, the program exits.
+
+To install mtdev, do
+
+   sudo make install
+
+By default, mtdev installs to /usr/local. To change, use the --prefix
+configure option.
+
+Enjoy,
+Henrik
diff --git a/Makefile.am b/Makefile.am
index 5fb2b00..c175641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,6 @@ INCLUDES = $(top_srcdir)/include/
 INSTALL:
 	$(INSTALL_CMD)
 ChangeLog:
-	$(CHANGELOG_CMD)
+	git log > ChangeLog
 
 dist-hook: ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
index 904cd67..a4fa9a2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,5 +8,3 @@ cd $srcdir
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index e5bdb71..56a4794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT([Multitouch Protocol Translation Library],
         [mtdev])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([config-aux])
 
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -21,12 +22,6 @@ AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_INSTALL
 
-# Initialize X.Org macros
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.5)
-XORG_DEFAULT_OPTIONS
-
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  test/Makefile
-- 
cgit v1.2.3