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.veli...@gmail.com> --- src/Makefile.am | 10 +--------- src/gallium/Makefile.am | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 4b8008c..d42b8ba 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 892f840..9be470d 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' ## @@ -166,3 +172,13 @@ if HAVE_ST_XVMC SUBDIRS += state_trackers/xvmc SUBDIRS += targets/xvmc endif + +## +## Gallium tests +## + +if HAVE_GALLIUM_TESTS +SUBDIRS += \ + tests/trivial \ + tests/unit +endif -- 2.0.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
