On Tue, Nov 28, 2017 at 09:49:11AM -0800, Jason Gerecke wrote:
> The Makefile.am contained under the tools subdirectory makes use of an
> Automake feature that allows the definition of per-executable CFLAGS.
> These CFLAGS definitions do not automatically include the general-use
> AM_CFLAGS. This has resulted in these executables not being built with
> the intentended warnings/errors enabled. Note that we also explicitly
> add "-Wno-error" to the definition of the "xsetwacom-test" binary since
> we don't want warnings there to break anything.
> 
> Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>

Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>

Cheers,
   Peter

> ---
>  tools/Makefile.am | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index 28c2fcd..e46fba5 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -28,11 +28,11 @@ shared_sources = tools-shared.h tools-shared.c
>  isdv4_serial_debugger_SOURCES = isdv4-serial-debugger.c $(shared_sources)
>  
>  isdv4_serial_inputattach_SOURCES = isdv4-serial-inputattach.c 
> $(shared_sources)
> -isdv4_serial_inputattach_CFLAGS = $(UDEV_CFLAGS)
> +isdv4_serial_inputattach_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
>  isdv4_serial_inputattach_LDADD = $(UDEV_LIBS)
>  
>  xsetwacom_SOURCES = xsetwacom.c
> -xsetwacom_CFLAGS = $(X11_CFLAGS)
> +xsetwacom_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
>  xsetwacom_LDADD = $(X11_LIBS)
>  
>  if FUZZINTERFACE
> @@ -42,7 +42,7 @@ endif
>  if UNITTESTS
>  check_PROGRAMS = xsetwacom-test
>  xsetwacom_test_SOURCES=xsetwacom.c
> -xsetwacom_test_CFLAGS=-DBUILD_TEST $(X11_CFLAGS)
> +xsetwacom_test_CFLAGS=-DBUILD_TEST $(AM_CFLAGS) $(X11_CFLAGS) -Wno-error
>  xsetwacom_test_LDADD = $(X11_LIBS)
>  
>  TESTS=$(check_PROGRAMS)
> -- 
> 2.15.0
> 
> 
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
> 

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to