diff options
author | Emil Velikov <[email protected]> | 2014-11-10 18:59:34 +0000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-11-26 20:09:09 +0000 |
commit | c642e87d9f423c78bf631410e858f675292ba0c4 (patch) | |
tree | 085800f7016c2f621169166d3638bd4dcfc379ab /src/gallium/targets/pipe-loader/Makefile.am | |
parent | 86a51eb86177971d9a0c0f0028cc143b13486a07 (diff) |
auxiliary/vl: rework the build of the VL code
Rather than shoving all the VL code for non-VL targets, increasing
their size, just split it out and use it when needed. This gives us
the side effect of building vl_winsys_dri.c once, dropping a few
automake warnings, and reducing the size of the dri modules as below
text data bss dec hex filename
5850573 187549 1977928 8016050 7a50b2 before/nouveau_dri.so
5508486 187100 391240 6086826 5ce0aa after/nouveau_dri.so
The above data is for a nouveau + swrast + kms_swrast 'megadriver'.
v2: Do not include the vl sources in the auxiliary library.
v3: Rebase. Add nine.
Cc: Christian König <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/pipe-loader/Makefile.am')
-rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 5022550cf67..3d73a51535a 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -36,9 +36,19 @@ AM_CPPFLAGS = \ pipedir = $(libdir)/gallium-pipe pipe_LTLIBRARIES = -PIPE_LIBS = \ +PIPE_LIBS = + +if NEED_GALLIUM_VL +PIPE_LIBS += \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la +else +PIPE_LIBS += \ + $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la +endif + +PIPE_LIBS += \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/util/libmesautil.la \ + $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ |