[PATCH input-synaptics] tools: use more appropriate CFLAGS

Peter Hutterer peter.hutterer at who-t.net
Sun Feb 14 15:39:05 PST 2010


On Wed, Feb 10, 2010 at 08:22:37PM -0500, Gaetan Nadon wrote:
> -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 at videotron.ca>
> ---
>  tools/Makefile.am |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index 9c9f03c..1f8fe04 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -23,7 +23,7 @@ bin_PROGRAMS = \
>  	synclient \
>  	syndaemon
>  
> -AM_CFLAGS = $(XORG_CFLAGS)
> +AM_CFLAGS = -I$(top_srcdir)/include $(XTST_1_1_CFLAGS) $(RECORDPROTO_1_13_CFLAGS) -I$(sdkdir)
>  
>  synclient_SOURCES = synclient.c
>  synclient_LDFLAGS = -lm $(XI_LIBS)
> -- 
> 1.6.0.4
> 
> Quick test: in libXtst run 'make uninstall' and rebuild synaptics. It should fail;
> if not, record.h is picked up from somewhere else.

merged and pushed, thank you.

Cheers,
  Peter


More information about the xorg-devel mailing list