xf86-input-synaptics:master: 9 commit(s)
Peter Hutterer
whot at kemper.freedesktop.org
Mon Jul 11 16:47:17 PDT 2011
Reporting from xf86-input-synaptics: xf86-input-synaptics driver
Please visit:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics
Or get your own copy by using:
git-clone git://anongit.freedesktop.org/xorg/driver/xf86-input-synaptics
9 commits against master at a0b7f755...:
.gitignore | 4 --
Makefile.am | 104 ++--------------------------------------------------
conf/Makefile.am | 27 +++++++++++++
configure.ac | 9 +++-
include/Makefile.am | 21 ++++++++++
man/Makefile.am | 47 +++++++++++++++++++++++
src/Makefile.am | 52 ++++++++++++++++++++++++++
test/.gitignore | 6 +++
test/Makefile.am | 15 +++++++
tools/.gitignore | 3 +
tools/Makefile.am | 31 +++++++++++++++
tools/synclient.c | 1
12 files changed, 214 insertions(+), 106 deletions(-)
commit ca3e0b33d02a6a86b156008216bf94042b81ce71
Author: Gaetan Nadon <memsize at 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 <memsize at videotron.ca>
diffstat:
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit e3d5c397965a017afd2288e7f991920edb50cee4
Author: Gaetan Nadon <memsize at 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 <memsize at videotron.ca>
diffstat:
Makefile.am | 4 ++++
configure.ac | 4 ++++
2 files changed, 8 insertions(+)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit ce1c4ce6798e956e3fa68c68fde7b7900319bc31
Author: Gaetan Nadon <memsize at 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 <memsize at videotron.ca>
diffstat:
tools/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit 513d40f7c442f78574e8c71c9895106c3f8eab74
Author: Peter Hutterer <peter.hutterer at 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 <memsize at videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diffstat:
tools/synclient.c | 1 -
1 file changed, 1 deletion(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit 9d30992ef7e0f3e6efa93431551681660e6295d2
Author: Gaetan Nadon <memsize at 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 <memsize at videotron.ca>
diffstat:
tools/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit cb6818b6230ca43ddaabfb8f16feaef9ae3ef68e
Author: Gaetan Nadon <memsize at 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.lists at 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 <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diffstat:
.gitignore | 3 -
Makefile.am | 95 +-----------------------------------------------
conf/Makefile.am | 27 +++++++++++++
configure.ac | 6 +++
include/Makefile.am | 21 ++++++++++
man/Makefile.am | 47 +++++++++++++++++++++++
src/Makefile.am | 52 ++++++++++++++++++++++++++
test/.gitignore | 6 +++
test/Makefile.am | 15 +++++++
tools/.gitignore | 3 +
tools/Makefile.am | 31 +++++++++++++++
11 files changed, 210 insertions(+), 96 deletions(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit bb604aca58f9c718601a22290176e201e92d36ab
Author: Gaetan Nadon <memsize at 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 <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diffstat:
Makefile.am | 3 ---
1 file changed, 3 deletions(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit 9803edca13ed5b2531db71b1a151525733a6dd40
Author: Gaetan Nadon <memsize at 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 <daniel at fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diffstat:
.gitignore | 1 -
configure.ac | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
commit 414a6aac17d3afeed2db30f7990edbb81b244676
Author: Gaetan Nadon <memsize at 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.
Specifying XORG_CFLAGS for the tools worked around the issue by supplying
the real path to the xserver sdk. tools must not depend on xserver.
In any case it would be a brittle workaround.
--with-xorg-conf-dir='$${sysconfdir}/xorg':
althought this value will work, it brings some confusion as it is
unrelated to the where the configuration files are normally placed,
relative to $prefix which is /usr/share/X11 and not /etc.
This feature can be reintroduced later with the proper solution.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
diffstat:
Makefile.am | 6 ------
configure.ac | 5 -----
2 files changed, 11 deletions(-)
gitweb url:
http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics;a=commit;h=ca3e0b33
More information about the xorg-commit
mailing list