[Mesa-dev] [PATCHv2 06/20] automake: introduce install-gallium-links.mk

[Emil Velikov]

On 10/03/14 07:42, Kenneth Graunke wrote:
> On 03/08/2014 12:29 PM, Emil Velikov wrote:
>> This helper script will be used to minimise the duplication
>> during link generation across all gallium targets.
>>
>> v2:
>>   - Handle vdpau_LTLIBRARIES. Requested by Christian König.
>>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
>> ---
>>   install-gallium-links.mk | 23 +++++++++++++++++++++++
>>   1 file changed, 23 insertions(+)
>>   create mode 100644 install-gallium-links.mk
>>
>> diff --git a/install-gallium-links.mk b/install-gallium-links.mk
>> new file mode 100644
>> index 0000000..debfe6c
>> --- /dev/null
>> +++ b/install-gallium-links.mk
>> @@ -0,0 +1,23 @@
>> +# Provide compatibility with scripts for the old Mesa build system for
>> +# a while by putting a link to the driver into /lib of the build tree.
>> +
>> +all-local : .libs/install-gallium-links
>> +
>> +.libs/install-gallium-links : $(dri_LTLIBRARIES) $(vdpau_LTLIBRARIES) $(egl_LTLIBRARIES) $(lib_LTLIBRARIES)
>> +	$(AM_V_GEN)$(MKDIR_P) $(top_builddir)/$(LIB_DIR);	\
>> +	link_dir=$(top_builddir)/$(LIB_DIR)/gallium;		\
>> +	if test x$(egl_LTLIBRARIES) != x; then			\
>> +		link_dir=$(top_builddir)/$(LIB_DIR)/egl;	\
>> +	fi;							\
>> +	$(MKDIR_P) $$link_dir;					\
>> +	file_list=$(dri_LTLIBRARIES:%.la=.libs/%.so*);		\
>> +	file_list+=$(vdpau_LTLIBRARIES:%.la=.libs/%.so*);	\
>> +	file_list+=$(egl_LTLIBRARIES:%.la=.libs/%.so*);		\
>> +	file_list+=$(lib_LTLIBRARIES:%.la=.libs/%.so*);		\
>> +	for f in $$file_list; do 				\
>> +		if test -h .libs/$$f; then			\
>> +			cp -d $$f $$link_dir;			\
>> +		else						\
>> +			ln -f $$f $$link_dir;			\
>> +		fi;						\
>> +	done && touch $@
>>
>
> Are $(dri_LT_LIBRARIES), $(vdpau_LTLIBRARIES), and $(egl_LTLIBRARIES)
> empty for non-Gallium builds?  If so, it seems like you could just
> generalize install-lib-links.mk, and not make a second one that's almost
> identical.
>
Already mentioned it in IRC, although posting here for anyone that's
interested.

The main issue I see with reusing install-lib-links.mk is that the
destination folder (link_dir) differs and adding an explicit
link_dir=... in each caller might be an overkill.
FWIW I'm not objecting of dropping this extra script but it is the
least evil that I can think of.

-Emil