[Mesa-dev] [PATCH 1/7] build: Let install-lib-links.mk handle .la files in subdirectories.

[Kristian Høgsberg]

On Fri, Aug 15, 2014 at 10:47:05AM -0700, Matt Turner wrote:
> The next patches are going to combine some of the mapi subdirectories'
> Makefiles into a single Makefile, giving better build parallelism.
> 
> lib_LTLIBRARIES will be set to something like
> 
>    lib_LTLIBRARIES = shared-glapi/libglapi.la es2api/libGLESv2.la
> 
> and the current code in install-lib-links.mk simply prepends .libs/ and
> replaces the .la in order to create the filenames that it needs to ln/cp
> into the LIBDIR. This doesn't work when the .la file is actually in a
> subdirectory.
> 
> This patch fixes this and puts .libs/ in the right place.

It's quite a mouthful, but should do the right thing.

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

> ---
>  install-lib-links.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/install-lib-links.mk b/install-lib-links.mk
> index 09fb86a..5ea73853 100644
> --- a/install-lib-links.mk
> +++ b/install-lib-links.mk
> @@ -7,7 +7,7 @@ all-local : .libs/install-mesa-links
>  
>  .libs/install-mesa-links : $(lib_LTLIBRARIES)
>  	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
> -	for f in $(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*); do \
> +	for f in $(join $(addsuffix .libs/,$(dir $(lib_LTLIBRARIES))),$(notdir $(lib_LTLIBRARIES:%.la=%.$(LIB_EXT)*))); do \
>  		if test -h .libs/$$f; then			\
>  			cp -d $$f $(top_builddir)/$(LIB_DIR);	\
>  		else						\
> -- 
> 1.8.5.5
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev