summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--fdi/11-x11-synaptics.fdi13
-rw-r--r--fdi/Makefile.am21
4 files changed, 37 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 3e06dc1..7636621 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,4 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man tools
+SUBDIRS = src man tools fdi
diff --git a/configure.ac b/configure.ac
index a2f8ae3..073e9a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,4 +120,5 @@ XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
- tools/Makefile])
+ tools/Makefile
+ fdi/Makefile])
diff --git a/fdi/11-x11-synaptics.fdi b/fdi/11-x11-synaptics.fdi
new file mode 100644
index 0000000..6a86341
--- /dev/null
+++ b/fdi/11-x11-synaptics.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+ <device>
+ <match key="info.capabilities" contains="input.touchpad">
+ <match key="info.product" contains="Synaptics TouchPad">
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+ </match>
+ <match key="info.product" contains="AlpsPS/2 ALPS">
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
diff --git a/fdi/Makefile.am b/fdi/Makefile.am
new file mode 100644
index 0000000..e4f2815
--- /dev/null
+++ b/fdi/Makefile.am
@@ -0,0 +1,21 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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.
+
+EXTRA_DIST = 11-x11-synaptics.fdi