| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
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@videotron.ca>
|
|
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@videotron.ca>
|
|
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@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@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
With this change, the whole of the build is done non-recursively in the
top-level Makefile.am. This reduces the amount of overhead due to recursing
into directories only to build one file.
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Christoph Brill <egore911@egore911.de>
|
|
Without this change, cross-pkg-config could bring up the wrong paths to
$includedir/xorg, but also fixes linkage to not use LDFLAGS where LDADD
should have been used.
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Christoph Brill <egore911@egore911.de>
|
|
It ensures library is installed and sets LIBS = -lm
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
The current conditional building of the apps was introduced by
commit 080caee95c46bb471d1442dcab246460cad8c7be due to optional
support properties. This is no longer an issue.
There are no longer any reason not to build these bona fide apps.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Fix some m4 quoting
Fix some autoconf warnings
Regroup statements per section
Add comments
Regroup xtst and recordproto (a prereq) flags together
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
The driver does not require inputproto package
The hunting for record.h is done only if libXtst is installed
AC_CHECK_HEADERS is used rather than checking for package versions
HAVE_PROPERTIES is no longer required
Normal config output:
checking for XI... yes
checking for XTST... yes
checking for X11/extensions/record.h... yes
Permutations of --enable-tools and dependencies:
build_tools libXi installed Result
----------- --------------- ---------
yes yes build tools
auto yes build tools
no yes skip build
yes no abort configuration
auto no warn and skip build
no no warn and skip build
Permutations of libXtst, record.h and recordproto
libXtst record.h recordproto syndaemon
installed installed installed using XRecord?
yes yes yes yes
yes no yes no
no no yes no
no yes yes no
no no no no
Other scenarios are possible where you have 2 different versions of
record.h installed in different $prefix locations. The order
of *_CFLAGS will determine which one gets picked first.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Reported-by: Gabor Z. Papp <gzp@papp.hu>
Signed-off-by: Gabor Z. Papp <gzp@papp.hu>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
-I$(top_srcdir)/include: required for synaptics.h and
synaptics-properties.h. The module has not yet been installed
so there is no copy in server sdkdir (unless old copy)
$(XTST_1_1_CFLAGS): required if record.h is provided by
libXtst in $(includedir)/X11/extensions.
$(RECORDPROTO_1_13_CFLAGS): required if record.h is provided by
recordproto in $(includedir)/X11/extensions.
-I$(sdkdir): required for xserver-properties.h
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Acked-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Header record.h is not found in X11/extensions because -I leading
to that directory is missing. I think it was accidently removed
when fixing the CFLAGS misuse in an earlier commit.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
CFLAGS is a user variable.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
The record.h header used to be in recordproto up to excluding 1.14, then
moved to libXtst. Check for both and enable it dependent on which version we
have.
This avoids build errors on setups where a user updated recordproto but not
libXtst.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Xavier Chantry <shiningxc@gmail.com>
|
|
Separate dependencies for driver and synclient/syndaemon.
Add option --enable-tools to explicitly build the tools (default: auto)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
By default, use the properties unless the -s flag is given. For -m and -h
imply SHM though.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Christoph Brill <egore911@egore911.de>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Christoph Brill <egore911@egore911.de>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
|
This reverts commit 641b26da531b38313ecc68badac1a3ccfd6fc7af.
As requested by Peter Hutterer and Henrik Rydberg.
|
|
This patch prevents the polling of the keyboard state. Instead it uses the
XRecord extension of the Xserver for an event triggered notification of key
events. Of course, there is a fallback to the polling when no XRecord
extension is found. This should finally stop complains of syndaemon
preventing good power saving.
Signed-off-by: Christoph Brill <egore911@egore911.de>
|
|
This just separates driver-internal stuff (synapticsstr.h) from external
stuff used for the SHM config.
|
|
|
|
Let's keep the driver source and the client program source separate.
|
