[Mesa-dev] [PATCH 5/6] mapi: fix shared-glapi dependency tracking

[Emil Velikov]

On 02/03/15 18:17, Matt Turner wrote:
> On Mon, Mar 2, 2015 at 7:58 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> I.e. add shared-glapi/glapi_mapi_tmp.h to the SOURCES list. Otherwise
>> there will be no knowledge that the file is required by others for the
>> build. Thus autotools won't pick it up for the distribution tarball.
>>
>> Cc: "10.5" <mesa-stable at lists.freedesktop.org>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> ---
>>  src/mapi/Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
>> index 6794682..ab82e00 100644
>> --- a/src/mapi/Makefile.am
>> +++ b/src/mapi/Makefile.am
>> @@ -66,7 +66,7 @@ if HAVE_SHARED_GLAPI
>>  BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
>>
>>  lib_LTLIBRARIES += shared-glapi/libglapi.la
>> -shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
>> +shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
>>  shared_glapi_libglapi_la_CPPFLAGS = \
> 
> It looks like there's another case below that needs the same
> treatment. Search for MAPI_ABI_HEADER.
> 
Right the static glapi. Bth I did really look into that one as I've been
planning on nuking it. I have some local patches that fix xlib-libgl,
only to be reminded that windows/scons seems to use it explicitly.

Anywho thanks for spotting this out.

-Emil