From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 9 Mar 2006 16:24:46 +0000 (+0000)
Subject: Instead of adding extra flags to DEFINES with +=, define EXTRA_DEFINES instead.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d57301ba20568953b9196a4e191cd5656b22370;p=mesa.git

Instead of adding extra flags to DEFINES with +=, define EXTRA_DEFINES instead.
This eliminates a bunch of duplication in the compilation commmands.
---

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 84e244501ae..977967ac2fa 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
+EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
 
 SOURCES = \
 	  glcontextmodes.c \
@@ -53,10 +53,10 @@ INCLUDES = -I. \
 ##### RULES #####
 
 .c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES) $< -o $@
 
 .S.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES)  $< -o $@
 
 ##### TARGETS #####