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>

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

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