diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2017-11-16 15:09:48 -0800 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2017-11-29 13:48:26 -0800 |
| commit | 061519df07f23f96b5211ba71a851bb626881fb4 (patch) | |
| tree | 324a981e0b4b2282b3154f60a90af6ba224e5620 | |
| parent | 346c6392f48bf34484f45df5aa2425e90f9ecf30 (diff) | |
| download | xf86-input-wacom-061519df07f23f96b5211ba71a851bb626881fb4.tar.gz | |
Build tools with AM_CFLAGS and its warnings
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.gerecke@wacom.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
| -rw-r--r-- | tools/Makefile.am | 6 |
1 files 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) |