[Mesa-dev] [PATCH 11/15] dri/Makefile.defines: Only add -Iserver to includes if the dir exists

[Chad Versace]

On 08/04/2011 08:45 AM, Eric Anholt wrote:
> On Thu,  4 Aug 2011 02:47:20 -0700, Chad Versace <chad at chad-versace.us> wrote:
>> Without this change, the next commit breaks the i915 and i965 builds.
>>
>> CC: Chia-I Wu <olv at lunarg.com>,
>> CC: Chih-Wei Huang <cwhuang at android-x86.org>
>> Signed-off-by: Chad Versace <chad at chad-versace.us>
>> ---
>>  src/mesa/drivers/dri/Makefile.defines |    5 ++++-
>>  1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
>> index 1ee6ce2..3235bdc 100644
>> --- a/src/mesa/drivers/dri/Makefile.defines
>> +++ b/src/mesa/drivers/dri/Makefile.defines
>> @@ -15,13 +15,16 @@ COMMON_SOURCES := $(COMMON_GALLIUM_SOURCES) \
>>  SHARED_INCLUDES := \
>>  	-I. \
>>  	-I$(TOP)/src/mesa/drivers/dri/common \
>> -	-Iserver \
>>  	-I$(TOP)/include \
>>  	-I$(TOP)/src/mapi \
>>  	-I$(TOP)/src/mesa \
>>  	-I$(TOP)/src/egl/main \
>>  	$(LIBDRM_CFLAGS)
>>  
>> +ifeq (0, $(shell test -d server; echo $?))
>> +	SHARED_INCLUDES += -Iserver
>> +endif
>> +
>>  INCLUDES := $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
>>  INCLUDES += $(API_DEFINES)
> 
> Or we could just shove the -Iserver down into the DRI1 drivers.

Agreed. I like that solution much more than my ugly make/shell hack.

-- 
Chad Versace
chad at chad-versace.us

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20110804/ff32b1e1/attachment.pgp>