[Mesa-dev] [PATCHv3 1/4] pipe-loader: split out "client" version

[Emil Velikov]

On 11/02/14 23:51, Rob Clark wrote:
> From: Rob Clark <robclark at freedesktop.org>
> 
> Build two versions of pipe-loader, with only the client version linking
> in x11 client side dependencies.  This will allow the XA state tracker
> to use pipe-loader.
> 
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> ---
>  configure.ac                                       | 14 +++++++++++--
>  src/gallium/auxiliary/pipe-loader/Makefile.am      | 24 ++++++++++++++++++----
>  src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c |  2 ++
>  src/gallium/targets/gbm/Makefile.am                |  4 ++--
>  src/gallium/targets/opencl/Makefile.am             |  4 ++--
>  src/gallium/tests/trivial/Makefile.am              |  4 ++--
>  6 files changed, 40 insertions(+), 12 deletions(-)
> 
[snip]
> diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
> index 653302c..a75b49c 100644
> --- a/src/gallium/targets/opencl/Makefile.am
> +++ b/src/gallium/targets/opencl/Makefile.am
> @@ -7,11 +7,11 @@ lib at OPENCL_LIBNAME@_la_LDFLAGS = \
>  	-version-number 1:0
>  
>  lib at OPENCL_LIBNAME@_la_LIBADD = \
> -	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
> +	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
>  	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
>  	$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
> -	$(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
> +	$(GALLIUM_PIPE_LOADER_CLIENT_LIBS) $(LIBUDEV_LIBS) \
                                             ^^^^^^^^^^^^
I've nuked all libudev references outside of src/loader recently. Keep
an eye open during rebase

-Emil

>  	-ldl \
>  	-lclangCodeGen \
>  	-lclangFrontendTool \
> diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
> index d65eb86..65fa90d 100644
> --- a/src/gallium/tests/trivial/Makefile.am
> +++ b/src/gallium/tests/trivial/Makefile.am
> @@ -11,8 +11,8 @@ AM_CPPFLAGS = \
>  	-DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \
>  	$(GALLIUM_PIPE_LOADER_DEFINES)
>  
> -LDADD = $(GALLIUM_PIPE_LOADER_LIBS) \
> -	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
> +LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \
> +	$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \
>  	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
>  	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
>  	$(LIBUDEV_LIBS) \
>