[Mesa-dev] [PATCH 07/20] targets/dri: use install-gallium-links.mk

[Chia-I Wu]

On Thu, Mar 13, 2014 at 3:35 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 13/03/14 07:09, Steven Newbury wrote:
>>
>> On Tue, 2014-03-04 at 21:12 +0000, Emil Velikov wrote:
>>>
>>> Drop the duplication accross all dri targets.
>>
>>
>> ...
>>
>>> diff --git a/src/gallium/targets/dri-ilo/Makefile.am
>>> b/src/gallium/targets/dri-ilo/Makefile.am
>>> index 418e2ea..18d3c44 100644
>>> --- a/src/gallium/targets/dri-ilo/Makefile.am
>>> +++ b/src/gallium/targets/dri-ilo/Makefile.am
>>> @@ -59,9 +59,4 @@ ilo_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
>>>   ilo_dri_la_LIBADD += $(LLVM_LIBS)
>>>   endif
>>>
>>> -# 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: ilo_dri.la
>>> -       $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
>>> -       ln -f .libs/ilo_dri.so
>>> $(top_builddir)/$(LIB_DIR)/gallium/ilo_dri.so
>>> -       ln -sf ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i965_dri.so
>>
>>
>> This doesn't work for ilo since dri_LTLIBRARIES isn't set. (It uses
>> "noinst_LTLIBRARIES = ilo_dri.la" instead.)
>>
>> It's also not handling the i965_dri.so symlink as is removed above.
>>
>>
> Are you really using ilo or you'd like to point out that I've
> "unintentionally" swept it under the carpet :-P
>
> Chia-Wu
>
> I take it that you've deliberately left the library as noinst, is that to
> prevent any confusion with the classic i965 ?
> How would you feel on this topic - do we s/noinst_LT/lib_LT/ or just revert
> this hunk ?
I think it is fine to s/noinst_LT/dri_LT/ (and remove the -rpath
option several lines below).  I will create the patch shortly, so that
Intel folks can complain to me directly if they have concerns for
potential confusions.

>
> Cheers
> -Emil


-- 
olv at LunarG.com