automake: handle gallium SUBDIRs in gallium/Makefile

Considering the way we've been consolidating things it makes
sense to add the final two (aux and tests) in here.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 7da91a254437aa5ae1e0d3214bc04d306cafda53..3e736d02934489e45a94c4065dccbdcc84196a2e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,15 +48,7 @@ SUBDIRS += egl/main
 endif
 
 if HAVE_GALLIUM
-SUBDIRS +=                     \
-       gallium/auxiliary       \
-       gallium
-
-if HAVE_GALLIUM_TESTS
-SUBDIRS +=                     \
-       gallium/tests/trivial   \
-       gallium/tests/unit
-endif
+SUBDIRS += gallium
 endif
 
 EXTRA_DIST = getopt

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index d35e117578c0a06c53ca3e62592bd2e7b73686c1..1e1fd43d5083ff36a0d7e161aa1f1ef2c5562d48 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -1,5 +1,11 @@
 SUBDIRS =
 
+##
+## Gallium auxiliary module
+##
+
+SUBDIRS += auxiliary
+
 ##
 ## Gallium pipe drivers and their respective winsys'
 ##
@@ -156,3 +162,13 @@ endif
 if HAVE_ST_XVMC
 SUBDIRS += state_trackers/xvmc targets/xvmc
 endif
+
+##
+## Gallium tests
+##
+
+if HAVE_GALLIUM_TESTS
+SUBDIRS += \
+       tests/trivial \
+       tests/unit
+endif