[Mesa-dev] [PATCH] egl/main: use separate LIBEGL_C_FILES and LIBEGL_H_FILES to fix SCons build

[Brian Paul]

I guess I missed that patch/discussion.  That fixes things for me too.

-Brian

On 08/14/2014 08:49 AM, Emil Velikov wrote:
> On 14/08/14 15:38, Brian Paul wrote:
>> The linker was trying to process .h files and failing.
> Hi Brian, what linker do you have in mind ? Is it the same issue as reported
> here [1] ? If so I've just pushed Jose's patch which explicitly handles scons.
>
> commit d4a1f3fd270001b2fb0684dc981340391df8fb64
> Author: Jose Fonseca <jfonseca at vmware.com>
> Date:   Wed Aug 13 20:33:35 2014 +0100
>
>      scons: do not include headers from the sources lists
>
>
> -Emil
>
> [1] https://urldefense.proofpoint.com/v1/url?u=https://bugs.freedesktop.org/show_bug.cgi?id%3D82534&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=toHOIPIotrjbrpC6XOIQWRAIUxSJLYHsUM%2Bq8nUooWI%3D%0A&s=470d545554f902da2fca8e17cf4def93576c3b65d0a2b0c80f73a4256a2f2d9b
>
>> ---
>>   src/egl/main/Makefile.am      |    3 ++-
>>   src/egl/main/Makefile.sources |   36 ++++++++++++++++++++----------------
>>   2 files changed, 22 insertions(+), 17 deletions(-)
>>
>> diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
>> index 6746bcc..06f6a05 100644
>> --- a/src/egl/main/Makefile.am
>> +++ b/src/egl/main/Makefile.am
>> @@ -34,7 +34,8 @@ AM_CFLAGS = \
>>   lib_LTLIBRARIES = libEGL.la
>>
>>   libEGL_la_SOURCES = \
>> -	${LIBEGL_C_FILES}
>> +	${LIBEGL_C_FILES} \
>> +	${LIBEGL_H_FILES}
>>
>>   libEGL_la_LIBADD = \
>>   	$(EGL_LIB_DEPS)
>> diff --git a/src/egl/main/Makefile.sources b/src/egl/main/Makefile.sources
>> index 6a917e2..3573004 100644
>> --- a/src/egl/main/Makefile.sources
>> +++ b/src/egl/main/Makefile.sources
>> @@ -1,38 +1,42 @@
>>   LIBEGL_C_FILES := \
>>   	eglapi.c \
>> -	eglapi.h \
>>   	eglarray.c \
>> +	eglconfig.c \
>> +	eglcontext.c \
>> +	eglcurrent.c \
>> +	egldisplay.c \
>> +	egldriver.c \
>> +	eglfallbacks.c \
>> +	eglglobals.c \
>> +	eglimage.c \
>> +	egllog.c \
>> +	eglmisc.c \
>> +	eglmode.c \
>> +	eglscreen.c \
>> +	eglstring.c \
>> +	eglsurface.c \
>> +	eglsync.c
>> +
>> +
>> +LIBEGL_H_FILES := \
>> +	eglapi.h \
>>   	eglarray.h \
>>   	eglcompiler.h \
>> -	eglconfig.c \
>>   	eglconfig.h \
>> -	eglcontext.c \
>>   	eglcontext.h \
>> -	eglcurrent.c \
>>   	eglcurrent.h \
>>   	egldefines.h \
>> -	egldisplay.c \
>>   	egldisplay.h \
>> -	egldriver.c \
>>   	egldriver.h \
>> -	eglfallbacks.c \
>> -	eglglobals.c \
>>   	eglglobals.h \
>> -	eglimage.c \
>>   	eglimage.h \
>> -	egllog.c \
>>   	egllog.h \
>> -	eglmisc.c \
>>   	eglmisc.h \
>> -	eglmode.c \
>>   	eglmode.h \
>>   	eglmutex.h \
>> -	eglscreen.c \
>>   	eglscreen.h \
>> -	eglstring.c \
>>   	eglstring.h \
>> -	eglsurface.c \
>>   	eglsurface.h \
>> -	eglsync.c \
>>   	eglsync.h \
>>   	egltypedefs.h
>> +
>>
>