From f7d196b5a173efdbec60330fac2c90fdaa218ff5 Mon Sep 17 00:00:00 2001 From: nobled Date: Mon, 4 Oct 2010 13:41:39 +0000 Subject: [PATCH 2/4] i965: Add missing TALLOC_* flags Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29789 Also, INCLUDES isn't the right variable -- it's just ignored and overwritten by ../Makefile.template. Use DRIVER_DEFINES instead. NOTE: This is candidate for the 7.9 branch. --- src/mesa/drivers/dri/i965/Makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index bea48e1..e817b58 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -111,10 +111,8 @@ CXX_SOURCES = \ ASM_SOURCES = -DRIVER_DEFINES = -I../intel - -INCLUDES += $(INTEL_CFLAGS) -DRI_LIB_DEPS += $(INTEL_LIBS) +DRIVER_DEFINES = -I../intel $(INTEL_CFLAGS) $(TALLOC_CFLAGS) +DRI_LIB_DEPS +=$(INTEL_LIBS) $(TALLOC_LIBS) include ../Makefile.template -- 1.7.0.4