summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am10
-rw-r--r--src/gallium/Makefile.am16
2 files changed, 17 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7da91a25443..3e736d02934 100644
--- 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 d35e117578c..1e1fd43d508 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -1,6 +1,12 @@
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