Set DRIVER_DEFINES instead of DEFINES to fix duplicate flags problem

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 7d8a170a6508a27a4137b0fe7727e42631a9ce8c..2084d52132e241e7bd3430a080901e98459de5ad 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -38,7 +38,7 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 X86_SOURCES = r200_vtxtmp_x86.S
 
-DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
+DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
 
 SYMLINKS = \
        server/radeon_egl.c  \

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 3158ac8412beaa64b70f01d78aff1e5a1baa2fbc..5abb91d98761532bd80bc2d7a8008d8024c1f5ee 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -5,7 +5,6 @@ TOP = ../../../../..
 include $(TOP)/configs/current
 
 LIBNAME = r300_dri.so
-DEFINES += -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0
 
 MINIGLX_SOURCES = server/radeon_dri.c
 
@@ -70,7 +69,8 @@ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 X86_SOURCES = 
 #r200_vtxtmp_x86.S
 
-DEFINES += -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
+DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \
+       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
 
 SYMLINKS = \
        server/radeon_dri.c \

diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 34dc58e2dc20fb0c975a6ba1699478741b246365..6e46620b3974ef336141d468e0ed6ba32b9e7528 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -32,7 +32,7 @@ C_SOURCES = \
        $(COMMON_SOURCES) \
        $(DRIVER_SOURCES) 
 
-DEFINES += -DRADEON_COMMON=0
+DRIVER_DEFINES = -DRADEON_COMMON=0
 
 X86_SOURCES = \
        radeon_vtxtmp_x86.S