summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-07-20 23:20:57 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-13 00:46:54 +0100
commitb75e0d7e25c51f944347cd59ccfaf26bf917258f (patch)
tree9b923f53294b48d7ee212320e1690fcc4a6a5a94 /src/Makefile.am
parent7af25d17a5956106c5319ba8cd7d947fbab76f6b (diff)
downloadexternal_mesa3d-b75e0d7e25c51f944347cd59ccfaf26bf917258f.zip
external_mesa3d-b75e0d7e25c51f944347cd59ccfaf26bf917258f.tar.gz
external_mesa3d-b75e0d7e25c51f944347cd59ccfaf26bf917258f.tar.bz2
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>
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7da91a2..3e736d0 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