From f5b7a1d2da68bc6daf65cfe456f335105cc9e584 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 10 Mar 2015 18:02:20 +0000 Subject: tests: move the SUBDIR at the top of the makefile None of the subdirs require the modules built in the local makefile, so moving them at the top makes things a hell lot easier to read. Signed-off-by: Emil Velikov --- tests/Makefile.am | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a2d82659..a1106fce 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,3 @@ -AM_CFLAGS = \ - $(WARN_CFLAGS)\ - -I $(top_srcdir)/include/drm \ - -I $(top_srcdir) - -LDADD = $(top_builddir)/libdrm.la - -check_PROGRAMS = \ - dristat \ - drmstat - SUBDIRS = modeprint proptest if HAVE_LIBKMS @@ -27,6 +16,21 @@ if HAVE_TEGRA SUBDIRS += tegra endif +if HAVE_LIBUDEV +SUBDIRS += vbltest +endif + +AM_CFLAGS = \ + $(WARN_CFLAGS)\ + -I $(top_srcdir)/include/drm \ + -I $(top_srcdir) + +LDADD = $(top_builddir)/libdrm.la + +check_PROGRAMS = \ + dristat \ + drmstat + if HAVE_LIBUDEV check_LTLIBRARIES = libdrmtest.la @@ -54,8 +58,6 @@ TESTS = \ updatedraw \ name_from_fd -SUBDIRS += vbltest - check_PROGRAMS += $(TESTS) endif -- cgit v1.2.3