[PATCH libinput 6/8] test/Makefile.am: Use $(GCC_CFLAGS) from configure.ac

sardemff7+wayland at sardemff7.net sardemff7+wayland at sardemff7.net
Tue Mar 25 20:21:47 PDT 2014


On 25/03/2014 21:45, Jonas Ådahl wrote:
> Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
> ---
>   test/Makefile.am | 15 ++++++++-------
>   1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/test/Makefile.am b/test/Makefile.am
> index b59d4a9..12ed023 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -2,6 +2,7 @@ if BUILD_TESTS
>   AM_CPPFLAGS = -I$(top_srcdir)/src $(CHECK_CFLAGS) $(LIBEVDEV_CFLAGS)
>
>   TEST_LIBS = liblitest.la $(CHECK_LIBS) $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libinput.la -lm
> +TEST_CFLAGS = $(GCC_CFLAGS) $(AM_CPPFLAGS)

AM_CPPFLAGS is wrong here, it must be AM_CFLAGS. The way it is currently 
written (or with this patch) AM_CPPFLAGS are passed twice while 
AM_CFLAGS are ignored. It may not be important but it is still wrong.
You could also drop TEST_CFLAGS altogether and append the GCC_CFLAGS to 
AM_CFLAGS in configure.ac.

(In your C++ test patch, you should also add AM_CXXFLAGS to 
test_build_cxx_CXXFLAGS.)


-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list