Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[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 e4fff5746d81746360bcebd6e43ad0bbd6788be0..776f1e3f3f77b30b044cc8b1bd20944e22a534b2 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -3,6 +3,8 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+CFLAGS += $(RADEON_CFLAGS)
+
 LIBNAME = r200_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c 
@@ -11,39 +13,51 @@ ifeq ($(USING_EGL), 1)
 EGL_SOURCES = server/radeon_egl.c
 endif
 
+ifeq ($(RADEON_LDFLAGS),)
+CS_SOURCES = radeon_cs_space_drm.c
+endif
+
+RADEON_COMMON_SOURCES = \
+       radeon_bo_legacy.c \
+       radeon_common_context.c \
+       radeon_common.c \
+       radeon_cs_legacy.c \
+       radeon_dma.c \
+       radeon_debug.c \
+       radeon_fbo.c \
+       radeon_lock.c \
+       radeon_mipmap_tree.c \
+       radeon_queryobj.c \
+       radeon_span.c \
+       radeon_texture.c
+
+
 DRIVER_SOURCES = r200_context.c \
                 r200_ioctl.c \
-                r200_lock.c \
-                r200_screen.c \
                 r200_state.c \
                 r200_state_init.c \
                 r200_cmdbuf.c \
                 r200_pixel.c \
                 r200_tex.c \
-                r200_texmem.c \
                 r200_texstate.c \
                 r200_tcl.c \
                 r200_swtcl.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 \
-                $(EGL_SOURCES)
+                r200_fragshader.c \
+                r200_vertprog.c \
+                radeon_screen.c \
+                $(EGL_SOURCES) \
+                $(RADEON_COMMON_SOURCES) \
+                $(CS_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-X86_SOURCES = r200_vtxtmp_x86.S
+X86_SOURCES = 
 
-SYMLINKS = \
-       server/radeon_egl.c  \
-       server/radeon_dri.c  \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h
+DRIVER_DEFINES = -DRADEON_R200 -Wall
+
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####
 
@@ -52,11 +66,3 @@ include ../Makefile.template
 
 #INCLUDES += -I../radeon/server
 
-server:
-       mkdir -p server
-
-$(SYMLINKS): server
-       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
-
-symlinks: $(SYMLINKS)
-