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 <emil.l.velikov at gmail.com>
---
 tests/Makefile.am | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0281aa..90f6405 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,13 +1,3 @@
-AM_CPPFLAGS = \
-       -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 +17,20 @@ SUBDIRS += tegra
 endif

 if HAVE_LIBUDEV
+SUBDIRS += vbltest
+endif
+
+AM_CPPFLAGS = \
+       -I $(top_srcdir)/include/drm \
+       -I $(top_srcdir)
+
+LDADD = $(top_builddir)/libdrm.la
+
+check_PROGRAMS = \
+       dristat \
+       drmstat
+
+if HAVE_LIBUDEV

 check_LTLIBRARIES = libdrmtest.la

@@ -53,8 +57,6 @@ TESTS =                                               \
        updatedraw                              \
        name_from_fd

-SUBDIRS += vbltest
-
 check_PROGRAMS += $(TESTS)

 endif
-- 
2.1.3

Reply via email to