Makefile.am | 8
conf/50-synaptics.conf | 8
configure.ac | 36 ++-
include/Makefile.am | 1
man/Makefile.am | 3
man/syndaemon.man | 41 +++-
src/Makefile.am | 9
src/alpscomm.c | 13 -
src/alpscomm.h | 33 ---
src/eventcomm.c | 374 ++++++++++++++++++++++++----------------
src/eventcomm.h | 6
src/properties.c | 35 +++
src/ps2comm.c | 91 ++++-----
src/ps2comm.h | 13 +
src/psmcomm.c | 37 +---
src/synaptics.c | 234 +++++++++++++------------
src/synapticsstr.h | 12 -
src/synproto.h | 21 --
test/.gitignore | 6
test/Makefile.am | 15 +
test/eventcomm-test.c | 285 ++++++++++++++++++++++++++++++
test/fake-symbols.c | 452 +++++++++++++++++++++++++++++++++++++++++++++++++
test/fake-symbols.h | 178 +++++++++++++++++++
test/test-pad.c | 121 -------------
test/testprotocol.c | 82 --------
tools/Makefile.am | 3
tools/synclient.c | 1
tools/syndaemon.c | 7
28 files changed, 1497 insertions(+), 628 deletions(-)
New commits:
commit 065a0b495d2a7eb76b61f9eec85248aefae4c8ee
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Sep 2 16:04:07 2011 +1000
synaptics 1.5.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 09306ec..f13fcdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.4.99.1],
+ [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3489e2467d43217971f17b9344fc2772cc0f164d
Author: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Date: Fri Aug 26 18:42:08 2011 +0600
The correct maximum values for pressure and finger width
Signed-off-by: Alexandr Shadchin <alexandr.shadc...@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
(cherry picked from commit 7a72af1ce105fd857214bb641a8fa2cfd150a5f7)
diff --git a/src/synaptics.c b/src/synaptics.c
index cf91b9f..d036bdf 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -231,7 +231,7 @@ SanitizeDimensions(InputInfoPtr pInfo)
if (priv->minp >= priv->maxp)
{
priv->minp = 0;
- priv->maxp = 256;
+ priv->maxp = 255;
xf86IDrvMsg(pInfo, X_PROBED,
"invalid pressure range. defaulting to %d - %d\n",
@@ -241,7 +241,7 @@ SanitizeDimensions(InputInfoPtr pInfo)
if (priv->minw >= priv->maxw)
{
priv->minw = 0;
- priv->maxw = 16;
+ priv->maxw = 15;
xf86IDrvMsg(pInfo, X_PROBED,
"invalid finger width range. defaulting to %d - %d\n",
@@ -444,7 +444,7 @@ static void set_default_parameters(InputInfoPtr pInfo)
horizHyst = pars->hyst_x >= 0 ? pars->hyst_x : diag * 0.005;
vertHyst = pars->hyst_y >= 0 ? pars->hyst_y : diag * 0.005;
- range = priv->maxp - priv->minp;
+ range = priv->maxp - priv->minp + 1;
/* scaling based on defaults and a pressure of 256 */
fingerLow = priv->minp + range * (25.0/256);
@@ -457,7 +457,7 @@ static void set_default_parameters(InputInfoPtr pInfo)
pressureMotionMaxZ = priv->minp + range * (160.0/256);
palmMinZ = priv->minp + range * (200.0/256);
- range = priv->maxw - priv->minw;
+ range = priv->maxw - priv->minw + 1;
/* scaling based on defaults below and a tool width of 16 */
palmMinWidth = priv->minw + range * (10.0/16);
commit 98e8481cf4911506403b8963fc32c61a74cf679e
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Aug 19 15:57:08 2011 +1000
Bump to 1.4.99.1
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index adbf594..09306ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.4.99],
+ [1.4.99.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit dd6c51499e626b1bc3ddd82949691efa667ff1c4
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 28 11:02:45 2011 +1000
syndaemon: Remove superfluous message.
toggle_touchpad() already prints if we're running verbose.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index d527b76..bead545 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -449,7 +449,6 @@ void record_main_loop(Display* display, double idle_time) {
if (ret == 0 && pad_disabled) { /* timeout => enable event */
toggle_touchpad(True);
- if (verbose) printf("enable touchpad\n");
}
} /* end while(1) */
commit ba53d850252165ba96e7abc6e7dd0648b40ee37b
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 28 10:57:12 2011 +1000
syndaemon: document exit codes and change them to fall into categories.
Changing pid file creation failure to same exit code that fork() failure
uses.
Changing XRECORD init failure to unique code. This way clients can trap
exit code 4 and re-start syndaemon without the -R flag.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/man/syndaemon.man b/man/syndaemon.man
index f850941..a9d69b0 100644
--- a/man/syndaemon.man
+++ b/man/syndaemon.man
@@ -66,6 +66,26 @@ the keyboard state.
.TP
\fBDISPLAY\fP
Specifies the X server to contact.
+.SH EXIT CODES
+If syndaemon exists with a return code other than 0, the error encountered
+is as below.
+.LP
+.TP
+\fBExit code 1
+Invalid commandline argument.
+.LP
+.TP
+\fBExit code 2
+The connection to the X sever could not be established or no touchpad device
+could be found.
+.LP
+.TP
+\fBExit code 3
+The fork into daemon mode failed or the pid file could not be created.
+.LP
+.TP
+\fBExit code 4
+XRECORD requested but not available or usable on the server.
.SH "CAVEATS"
.LP
It doesn't make much sense to connect to a remote X server, because
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index a8a0499..d527b76 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -598,7 +598,7 @@ main(int argc, char *argv[])
FILE *fd = fopen(pid_file, "w");
if (!fd) {
perror("Can't create pid file");
- exit(2);
+ exit(3);
}
fprintf(fd, "%d\n", getpid());
fclose(fd);
@@ -616,7 +616,7 @@ main(int argc, char *argv[])
else {
fprintf(stderr, "Use of XRecord requested, but failed to "
" initialize.\n");
- exit(2);
+ exit(4);
}
} else
#endif /* HAVE_X11_EXTENSIONS_RECORD_H */
commit 8d0d011cda37f5202ee0de76ef1ada8643624919
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 28 10:44:42 2011 +1000
man: remove documentation for -s switch, SHM is gone.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/man/syndaemon.man b/man/syndaemon.man
index 1094b3b..f850941 100644
--- a/man/syndaemon.man
+++ b/man/syndaemon.man
@@ -8,7 +8,7 @@ the touchpad when the keyboard is being used.
.SH "SYNOPSIS"
.LP
syndaemon [\fI\-i idle\-time\fP] [\fI\-m poll-inverval\fP] [\fI\-d\fP] [\fI\-p
pid\-file\fP]
-[\fI\-t\fP] [\fI\-k\fP] [\fI\-K\fP] [\fI\-R\fP] [\fI\-s\fP]
+[\fI\-t\fP] [\fI\-k\fP] [\fI\-K\fP] [\fI\-R\fP]
.SH "DESCRIPTION"
.LP
Disabling the touchpad while typing avoids unwanted movements of the
@@ -61,13 +61,6 @@ Like \-k but also ignore Modifier+Key combos.
\fB\-R\fP
Use the XRecord extension for detecting keyboard activity instead of polling
the keyboard state.
-.LP
-.TP
-\fB\-s\fP
-Use a shared memory area to enable/disable the touchpad instead of device
-properties. WARNING: The SHM mechanism is not secure if you are in an
untrusted multiuser
-environment. All local users can change the parameters at any time. This
-option requires the driver Option "SHMConfig" to be enabled.
.SH "ENVIRONMENT VARIABLES"
.LP
.TP
commit 72d5b4886927aee5fbc871b5c3d0300be92d8ecc
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Jul 28 10:43:38 2011 +1000
man: document syndaemon -m switch
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/man/syndaemon.man b/man/syndaemon.man
index 4fbb568..1094b3b 100644
--- a/man/syndaemon.man
+++ b/man/syndaemon.man
@@ -7,7 +7,7 @@ syndaemon \- a program that monitors keyboard activity and
disables
the touchpad when the keyboard is being used.
.SH "SYNOPSIS"
.LP
-syndaemon [\fI\-i idle\-time\fP] [\fI\-d\fP] [\fI\-p pid\-file\fP]
+syndaemon [\fI\-i idle\-time\fP] [\fI\-m poll-inverval\fP] [\fI\-d\fP] [\fI\-p
pid\-file\fP]
[\fI\-t\fP] [\fI\-k\fP] [\fI\-K\fP] [\fI\-R\fP] [\fI\-s\fP]
.SH "DESCRIPTION"
.LP
@@ -24,6 +24,16 @@ touchpad.
(default is 2.0s).
.LP
.TP
+\fB\-m\fR <\fIpoll\-interval\fP>
+How many milliseconds to wait between two polling intervals. If this value is
+too low, it will cause unnecessary wake-ups. If this value is too high,
+some key presses (press and release happen between two intervals) may not
+be noticed. This switch has no effect when running with
+\fB-R\fP.
+.
+Default is 200ms.
+.LP
+.TP
\fB\-d\fP
Start as a daemon, ie in the background.
.LP
commit ca3e0b33d02a6a86b156008216bf94042b81ce71
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Jun 30 11:10:04 2011 -0400
Add distcheck support for configuration files when dir is not writable
Provide a user writable location for configuration files.
Many values will work, but preserving the semantic by using
a value based on the server default value is more helpful.
The configdir automake variable and the pkgconfig sysconfigdir variable
should not be confused with the sysconfdir automake provided
configuration option which default value is $prefix/etc.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index b6e15cd..6fdd067 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,9 @@
# During distcheck, system locations (as provided by pkg-config) may
# not be writable; provide instead relative locations.
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-sdkdir='$${includedir}/xorg' \
+ --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = include src man tools conf test
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit e3d5c397965a017afd2288e7f991920edb50cee4
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Jun 30 10:15:24 2011 -0400
Add distcheck support for header files when sdk is not writable
During distcheck, a writable location is supplied for the install test.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index edd28a6..b6e15cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,10 @@
# 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.
+# During distcheck, system locations (as provided by pkg-config) may
+# not be writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+
SUBDIRS = include src man tools conf test
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 2fe5289..adbf594 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,10 @@ if test "x$have_libxtst" = "xyes" ; then
fi
# -----------------------------------------------------------------------------
+# Workaround overriding sdkdir to be able to create a tarball when user has no
+# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
+AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
commit ce1c4ce6798e956e3fa68c68fde7b7900319bc31
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Jul 11 08:02:39 2011 -0400
tools: remove unrequired sdkdir include directive
Now that xserver-properties.h is no longer included,
the path to the xserver header files is no longer needed.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5abdecf..e790905 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = synclient syndaemon
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(sdkdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XI_CFLAGS)
AM_LDFLAGS = $(XI_LIBS)
commit 513d40f7c442f78574e8c71c9895106c3f8eab74
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Jul 5 09:48:01 2011 +1000
tools: don't include xserver-properties.h
Remove the header inclusion to avoid dependency of synclient on the xserver
headers. The only property we need from the server is FLOAT and we can
simply define that here.
Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/tools/synclient.c b/tools/synclient.c
index 9776d23..08bd22b 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -45,7 +45,6 @@
#include <X11/extensions/XInput.h>
#include "synaptics.h"
#include "synaptics-properties.h"
-#include <xserver-properties.h>
#ifndef XATOM_FLOAT
#define XATOM_FLOAT "FLOAT"
commit 9d30992ef7e0f3e6efa93431551681660e6295d2
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Jun 28 17:14:00 2011 -0400
Revert "build: sort building of tools, ensure that cross-pkg-config works."
This reverts commit 4005df66072ceac175ea71427deb16176262f197.
The patch introduces a couple of issues.
1) These tools are apps and conceptually do not depend on Xserver,
so XORG_CFLAGS should not be used. It included pixman header files.
Only drivers depend xserver
2) XORG_CFLAGS may contain, depending on the platform, a compiler
visibilty flag. Compiler flags cannot be assigned to AM_CPPFLAGS
preprocessor flags variable.
There were two changes introduced by the patch.
1) Possible wrong order of include directives
The commit text does not mention which paths may be in the wrong order.
2) Incorrect usage of AM_LDFLAGS
The patch does not really change anything. If the intention was for the
tools
to link directly to the libraries, it would look like:
LDADD = $(top_builddir)/src/libpciaccess.la # scanpci example
This is only possible for libraries built in the same package.
There is nothing wrong in putting -l -L flags in LDADD, but should there
be other flags, LDFLAGS would be required, ending with two variables.
It looks easier to revert the patch to the previosuly known good version
which has been in service for a year.
Unfortunatly, the reversal breaks distcheck as it removes an unsuspected
workaround.
The value of sdkdir during distcheck points to an empty xserver sdkdir
where xserver-properties.h is expected by the tools.
Specifying XORG_CFLAGS worked around the issue by supplying the real path
to the xserver sdk.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c74a5e3..5abdecf 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,12 +20,12 @@
bin_PROGRAMS = synclient syndaemon
-AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(sdkdir)
+AM_CFLAGS = $(XI_CFLAGS)
+AM_LDFLAGS = $(XI_LIBS)
synclient_SOURCES = synclient.c
-synclient_CFLAGS = $(XI_CFLAGS)
-synclient_LDADD = $(XI_LIBS)
syndaemon_SOURCES = syndaemon.c
-syndaemon_CFLAGS = $(XI_CFLAGS) $(XTST_CFLAGS)
-syndaemon_LDADD = $(XI_LIBS) $(XTST_LIBS)
+syndaemon_CFLAGS = $(AM_CFLAGS) $(XTST_CFLAGS)
+syndaemon_LDFLAGS = $(AM_LDFLAGS) $(XTST_LIBS)
commit cb6818b6230ca43ddaabfb8f16feaef9ae3ef68e
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Jun 28 17:13:30 2011 -0400
Revert "build: collapse all Makefile.am files into a single non-recursive
one."
This reverts commit 39afe69ad7d2258d4043044d1283bd6e311e48da.
1. For such a small module, the build time improvement is most likely
negligible. At least, I'd like to see some timings proving it's
worthiness before seeing the patch go back in.
2. This kind of change would need a thorough review. The need to
operate the build from a single toplevel Makefile is a significant
change. The two most noticeable issues for me are that collapsing all
the Makefiles could easily cause namespacing issues with the
variables, and operating on files outside the current directory can
introduce subtle bugs. I feel that the non-recursive style is
generally less robust than the standard recursive make scheme.
3. It's unlike all the other X.org modules. This isn't a showstopper
for me, but the recursive style is well understood here and you've
beaten all the modules into a consistent format that makes build bugs
unique to specific modules less likely.
Acked-by: Dan Nicholson <dbn.li...@gmail.com>
To give a concrete example for #3 above, the 175 man pages are much
easier maintained using a very similar makefile in the man directory
of all X.Org module.
The cost of maintaining a single makefile is much higher. Every target
in the makefile has to be reviewed and tested when changes are made.
Not everyone has the all the skills to handle widely different targets
such as man pages, DocBook/XML, librairies, C code, distribution hooks,
and so on.
Acked-by: Daniel Stone <dan...@fooishbar.org>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/.gitignore b/.gitignore
index 2f191c3..c496323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,3 @@ core
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
-eventcomm-test
-synclient
-syndaemon
diff --git a/Makefile.am b/Makefile.am
index 7cedc61..edd28a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,104 +18,13 @@
# 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.
+SUBDIRS = include src man tools conf test
MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-synaptics.pc
-sdk_HEADERS = include/synaptics.h include/synaptics-properties.h
-
-input_LTLIBRARIES = @DRIVER_NAME@_drv.la
-
-# -module lets us name the module exactly how we want
-# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
-# -shared avoid building the static archive
-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -shared
-@DRIVER_NAME@_drv_la_CPPFLAGS = -I$(top_srcdir)/include
-@DRIVER_NAME@_drv_la_CFLAGS = $(XORG_CFLAGS)
-
-@DRIVER_NAME@_drv_la_SOURCES = src/@DRIVER_NAME@.c src/synapticsstr.h \
- src/synproto.h \
- src/properties.c
-
-if BUILD_PS2COMM
-@DRIVER_NAME@_drv_la_SOURCES += \
- src/alpscomm.c \
- src/ps2comm.c src/ps2comm.h
-endif
-
-if BUILD_EVENTCOMM
-@DRIVER_NAME@_drv_la_SOURCES += \
- src/eventcomm.c src/eventcomm.h
-endif
-
-if BUILD_PSMCOMM
-@DRIVER_NAME@_drv_la_SOURCES += \
- src/psmcomm.c
-endif
-
-bin_PROGRAMS = synclient syndaemon
-
-synclient_SOURCES = tools/synclient.c
-synclient_CFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS) $(XI_CFLAGS)
-synclient_LDADD = $(XI_LIBS)
-
-syndaemon_SOURCES = tools/syndaemon.c
-syndaemon_CFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS) $(XI_CFLAGS)
$(XTST_CFLAGS)
-syndaemon_LDADD = $(XI_LIBS) $(XTST_LIBS)
-
-if HAS_XORG_CONF_DIR
-dist_config_DATA = conf/50-synaptics.conf
-else
-fdidir = $(datadir)/hal/fdi/policy/20thirdparty
-dist_fdi_DATA = conf/11-x11-synaptics.fdi
-endif
-
-if ENABLE_UNIT_TESTS
-if BUILD_EVENTCOMM
-check_PROGRAMS = eventcomm-test
-
-eventcomm_test_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
-eventcomm_test_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
-eventcomm_test_SOURCES = test/eventcomm-test.c\
- src/eventcomm.c \
- test/fake-symbols.c test/fake-symbols.h
-
-TESTS = $(check_PROGRAMS)
-endif
-endif
-
-synclientmandir = $(APP_MAN_DIR)
-synclientman_PRE = man/synclient.man
-synclientman_DATA = $(synclientman_PRE:man=@APP_MAN_SUFFIX@)
-
-syndaemonmandir = $(APP_MAN_DIR)
-syndaemonman_PRE = man/syndaemon.man
-syndaemonman_DATA = $(syndaemonman_PRE:man=@APP_MAN_SUFFIX@)
-
-drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = man/@DRIVER_NAME@.man
-driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-
-EXTRA_DIST = man/@DRIVER_NAME@.man man/synclient.man man/syndaemon.man
-
-CLEANFILES = $(driverman_DATA) $(synclientman_DATA) $(syndaemonman_DATA)
-
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-.PHONY: ChangeLog INSTALL mandir
-
-mandir:
- $(MKDIR_P) man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(DRIVER_MAN_SUFFIX):
- @$(MKDIR_P) man
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-.man.$(APP_MAN_SUFFIX):
- @$(MKDIR_P) man
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 0000000..38d2a01
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,27 @@
+# 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.
+
+
+if HAS_XORG_CONF_DIR
+dist_config_DATA = 50-synaptics.conf
+else
+fdidir = $(datadir)/hal/fdi/policy/20thirdparty
+dist_fdi_DATA = 11-x11-synaptics.fdi
+endif
diff --git a/configure.ac b/configure.ac
index e5427cd..2fe5289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,12 @@ fi
# -----------------------------------------------------------------------------
AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ tools/Makefile
+ conf/Makefile
+ include/Makefile
+ test/Makefile
xorg-synaptics.pc])
AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..f078e5e
--- /dev/null
+++ b/include/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.
+
+sdk_HEADERS = synaptics.h synaptics-properties.h
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..8d56fe0
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,47 @@
+# $Id$
+#
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# 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
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# 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 NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS 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.
+#
+
+synclientmandir = $(APP_MAN_DIR)
+synclientman_PRE = synclient.man
+synclientman_DATA = $(synclientman_PRE:man=@APP_MAN_SUFFIX@)
+
+syndaemonmandir = $(APP_MAN_DIR)
+syndaemonman_PRE = syndaemon.man
+syndaemonman_DATA =$(syndaemonman_PRE:man=@APP_MAN_SUFFIX@)
+
+drivermandir = $(DRIVER_MAN_DIR)
+driverman_PRE = @DRIVER_NAME@.man
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+
+EXTRA_DIST = @DRIVER_NAME@.man synclient.man syndaemon.man
+
+CLEANFILES = $(driverman_DATA) $(synclientman_DATA) $(syndaemonman_DATA)
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(DRIVER_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..5e04670
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,52 @@
+# 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.
+
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_ladir = @inputdir@
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = $(XORG_CFLAGS)
+
+@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \
+ synproto.h \
+ properties.c
+
+if BUILD_PS2COMM
+@DRIVER_NAME@_drv_la_SOURCES += \
+ alpscomm.c \
+ ps2comm.c ps2comm.h
+endif
+
+if BUILD_EVENTCOMM
+@DRIVER_NAME@_drv_la_SOURCES += \
+ eventcomm.c eventcomm.h
+endif
+
+if BUILD_PSMCOMM
+@DRIVER_NAME@_drv_la_SOURCES += \
+ psmcomm.c
+endif
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..a59f751
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,6 @@
+# Add & Override patterns for xf86-input-synaptics
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+
+eventcomm-test
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..5dd8cdb
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,15 @@
+if ENABLE_UNIT_TESTS
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
+fake_syms = fake-symbols.c fake-symbols.h
+
+if BUILD_EVENTCOMM
+noinst_PROGRAMS = eventcomm-test
+
+eventcomm_test_SOURCES = eventcomm-test.c\
+ $(top_srcdir)/src/eventcomm.c \
+ $(fake_syms)
+endif
+
+TESTS = $(noinst_PROGRAMS)
+endif
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000..f3b80fc
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,3 @@
+# Add & Override for this directory and it's subdirectories
+synclient
+syndaemon
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000..c74a5e3
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,31 @@
+# Copyright 2008 Red Hat, Inc.
+#
+# 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.
+
+bin_PROGRAMS = synclient syndaemon
+
+AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS)
+
+synclient_SOURCES = synclient.c
+synclient_CFLAGS = $(XI_CFLAGS)
+synclient_LDADD = $(XI_LIBS)
+
+syndaemon_SOURCES = syndaemon.c
+syndaemon_CFLAGS = $(XI_CFLAGS) $(XTST_CFLAGS)
+syndaemon_LDADD = $(XI_LIBS) $(XTST_LIBS)
commit bb604aca58f9c718601a22290176e201e92d36ab
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Jun 28 17:11:24 2011 -0400
Revert "build: install documentation as part of make install."
This reverts commit d27b4e560ccf61b94f067156c6d5c1e3d3e5e1eb.
ChangeLog is generated from git and should be created at dist time only.
The original patch creates it at make time multiple times and fails
when user permissions change such as when using sudo.
Some have expressed a desire to install files such as ChangeLog and README.
This reversal does not dismiss the idea, but simply reverts a non-essential
change that happens to have an implementation bug just before making a
module
release.
Anyone is welcome to promote the idea in the context of the X.Org project
where all modules would exhibit the same behaviour. The current behaviour of
ChangeLog, although not perfect, has been thoroughly reviewed and widely
accepted for several years.
As for the files in docs, they should be re-submitted for reviews to
determine
if they constitute users docs that should be installed as opposed to
developers docs which are not.
Reported-by: Daniel Stone <dan...@fooishbar.org>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 07cb902..7cedc61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,6 +124,3 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-dist_doc_DATA = ChangeLog README docs/README.alps \
- docs/trouble-shooting.txt docs/tapndrag.dia
commit 9803edca13ed5b2531db71b1a151525733a6dd40
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Jun 28 17:10:45 2011 -0400
Revert "build: create object files following the sources' structure."
This reverts commit dac624ad2b3a67ab93c11d8ee0a91b217fc1afe6.
Acked-by: Daniel Stone <dan...@fooishbar.org>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/.gitignore b/.gitignore
index 39e3f35..2f191c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,4 +79,3 @@ core
eventcomm-test
synclient
syndaemon
-.dirstamp
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index dfef591..e5427cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Initialize libtool
commit 414a6aac17d3afeed2db30f7990edbb81b244676
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Jun 28 17:10:21 2011 -0400
Revert "build: apply the distcheck tricks used in xf86-input-evdev"
This reverts commit 6eb829e07e455a8a04dabae7f257dd42a9b8bcdf.
Althought this feature is desirable, it introduces a dormant bug.
The value of sdkdir during distcheck points to an empty xserver sdkdir
where xserver-properties.h is expected by the tools.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r0yaz-00071v...@vasks.debian.org
