[Mesa-dev] [PATCH 2/6] gallium: include mapi headers which are utilized. fixes no-makedepend Haiku build

[Alexander von Gluck]

On 27.12.2011 10:31, Brian Paul wrote:
> On Tue, Dec 27, 2011 at 8:40 AM, Alexander von Gluck
> <kallisti5 at unixzen.com> wrote:
>>
>> ---
>>  src/gallium/drivers/r300/Makefile |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/gallium/drivers/r300/Makefile
>> b/src/gallium/drivers/r300/Makefile
>> index 5f56fc4..3e3a765 100644
>> --- a/src/gallium/drivers/r300/Makefile
>> +++ b/src/gallium/drivers/r300/Makefile
>> @@ -15,6 +15,7 @@ C_SOURCES += \
>>  LIBRARY_INCLUDES = \
>>        -I$(TOP)/include \
>>        -I$(TOP)/src/mesa \
>> +       -I$(TOP)/src/mapi \
>>        -I$(TOP)/src/glsl
>>
>>  include ../../Makefile.template
>> --
>
> That file no longer exists in Mesa/master.  Are you sure you're
> patching against the latest sources from git?

I checked and can confirm this issue still exists in master..

gcc -c -I. -I../../../../src/gallium/include 
-I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers 
-I../../../../include -I../../../../src/mesa -I../../../../src/glsl -Wall 
-Wno-multichar -DBEOS_THREADS -DGNU_ASSEMBLER -DUSE_X86_ASM -DUSE_MMX_ASM 
-DUSE_3DNOW_ASM -DUSE_SSE_ASM -fno-strict-aliasing -std=c99 -O3  
../../../../src/mesa/program/register_allocate.c -o 
../../../../src/mesa/program/register_allocate.o
In file included from ../../../../src/mesa/program/register_allocate.c:77:0:
../../../../src/mesa/main/mtypes.h:40:25: fatal error: glapi/glapi.h: No 
such file or directory
compilation terminated.
make[5]: *** [../../../../src/mesa/program/register_allocate.o] Error 1
make[5]: Leaving directory `/Data/mesa/src/gallium/drivers/r300'
make[4]: *** [default] Error 1
make[4]: Leaving directory `/Data/mesa/src/gallium/drivers'
make[3]: *** [default] Error 1
make[3]: Leaving directory `/Data/mesa/src/gallium'
make[2]: *** [subdirs] Error 1
make[2]: Leaving directory `/Data/mesa/src'
make[1]: *** [default] Error 1
make[1]: Leaving directory `/Data/mesa'
make: *** [haiku] Error 2

The r300 driver builds ../../../../src/mesa/program/register_allocate.c 
which needs it.

Thanks!
  -- Alex