dri: use BorderColor instead of _BorderChan

[mesa.git] / src / mesa / drivers / dri / r200 / Makefile

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 324e549922587df24c9d95c6c60d0869b74f1f56..e9144ac75ce117fb2b2385af12969a549bac28b8 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -7,22 +7,13 @@ LIBNAME = r200_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c 
 
-
-COMMON_SOURCES = \
-       ../../common/driverfuncs.c \
-       ../common/mm.c \
-       ../common/utils.c \
-       ../common/texmem.c \
-       ../common/vblank.c \
-       ../common/xmlconfig.c \
-       ../common/dri_util.c \
-       ../common/drirenderbuffer.c \
-       ../common/glcontextmodes.c
+ifeq ($(USING_EGL), 1)
+EGL_SOURCES = server/radeon_egl.c
+endif
 
 DRIVER_SOURCES = r200_context.c \
                 r200_ioctl.c \
                 r200_lock.c \
-                r200_screen.c \
                 r200_state.c \
                 r200_state_init.c \
                 r200_cmdbuf.c \
@@ -35,21 +26,29 @@ DRIVER_SOURCES = r200_context.c \
                 r200_span.c \
                 r200_maos.c \
                 r200_sanity.c \
-                r200_vtxfmt.c \
-                r200_vtxfmt_c.c \
-                r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
+                r200_fragshader.c \
+                r200_vertprog.c \
+                radeon_screen.c \
+                $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-X86_SOURCES = r200_vtxtmp_x86.S
+X86_SOURCES = 
+
+DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
 
 SYMLINKS = \
+       server/radeon_egl.c  \
        server/radeon_dri.c  \
-                 server/radeon_dri.h \
-                 server/radeon.h \
-                 server/radeon_macros.h \
-                 server/radeon_reg.h
+       server/radeon_dri.h \
+       server/radeon.h \
+       server/radeon_macros.h \
+       server/radeon_reg.h
+
+COMMON_SYMLINKS = \
+       radeon_chipset.h \
+       radeon_screen.c \
+       radeon_screen.h
 
 ##### TARGETS #####
 
@@ -64,5 +63,9 @@ server:
 $(SYMLINKS): server
        @[ -e $@ ] || ln -sf ../../radeon/$@ server/
 
-symlinks: $(SYMLINKS)
+
+$(COMMON_SYMLINKS):
+       @[ -e $@ ] || ln -sf ../radeon/$@ ./
+
+symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)