fix up radeon span functions using latest r200 code from Brian,

[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 ddc4652ac5d0f04936dc954d8853e2548a8f9ca5..dfeebca5a292782e5d677a7f413a09dcba001159 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -6,17 +6,10 @@ include $(TOP)/configs/current
 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/glcontextmodes.c
+
+ifeq ($(USING_EGL), 1)
+EGL_SOURCES = server/radeon_egl.c
+endif
 
 DRIVER_SOURCES = r200_context.c \
                 r200_ioctl.c \
@@ -37,18 +30,21 @@ DRIVER_SOURCES = r200_context.c \
                 r200_vtxfmt.c \
                 r200_vtxfmt_c.c \
                 r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
+                r200_vtxfmt_x86.c \
+                r200_fragshader.c \
+                $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 X86_SOURCES = r200_vtxtmp_x86.S
 
 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
 
 ##### TARGETS #####
 
@@ -57,9 +53,11 @@ include ../Makefile.template
 
 #INCLUDES += -I../radeon/server
 
-$(SYMLINKS):
+server:
        mkdir -p server
-       for i in $(SYMLINKS) ; do rm -f $$i && test -f ../radeon/$$i && ln -s ../../radeon/$$i $$i ; done
+
+$(SYMLINKS): server
+       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
 
 symlinks: $(SYMLINKS)