Track Radeon driver symlinks in Git.

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

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 6ca934204f38c6d7f4ec53b19328b145d9f558e2..7460410ee6576cd3436d23492f7d4ea6f7c29b6f 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -3,6 +3,8 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+CFLAGS += $(RADEON_CFLAGS)
+
 LIBNAME = r300_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c
@@ -11,6 +13,10 @@ ifeq ($(USING_EGL), 1)
 EGL_SOURCES = server/radeon_egl.c
 endif
 
+ifeq ($(RADEON_LDFLAGS),)
+CS_SOURCES = radeon_cs_space_drm.c
+endif
+
 COMMON_SOURCES = \
        ../../common/driverfuncs.c \
        ../common/mm.c \
@@ -20,20 +26,26 @@ COMMON_SOURCES = \
        ../common/xmlconfig.c \
        ../common/dri_util.c
 
+RADEON_COMMON_SOURCES = \
+       radeon_texture.c \
+       radeon_common_context.c \
+       radeon_common.c \
+       radeon_dma.c \
+       radeon_lock.c \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_mipmap_tree.c \
+       radeon_span.c \
+       radeon_fbo.c
+
 DRIVER_SOURCES = \
                 radeon_screen.c \
-                radeon_context.c \
-                radeon_ioctl.c \
-                radeon_lock.c \
-                radeon_span.c \
-                radeon_state.c \
-                r300_mem.c \
                 r300_context.c \
+                r300_draw.c \
                 r300_ioctl.c \
                 r300_cmdbuf.c \
                 r300_state.c \
                 r300_render.c \
-                r300_texmem.c \
                 r300_tex.c \
                 r300_texstate.c \
                 radeon_program.c \
@@ -41,6 +53,7 @@ DRIVER_SOURCES = \
                 radeon_program_pair.c \
                 radeon_nqssadce.c \
                 r300_vertprog.c \
+                r300_fragprog_common.c \
                 r300_fragprog.c \
                 r300_fragprog_swizzle.c \
                 r300_fragprog_emit.c \
@@ -49,38 +62,21 @@ DRIVER_SOURCES = \
                 r300_shader.c \
                 r300_emit.c \
                 r300_swtcl.c \
-                $(EGL_SOURCES)
+                $(RADEON_COMMON_SOURCES) \
+                $(EGL_SOURCES) \
+                $(CS_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
 DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
-       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
+       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
+#      -DRADEON_BO_TRACK \
+       -Wall
 
-SYMLINKS = \
-       server/radeon_dri.c \
-       server/radeon_dri.h \
-       server/radeon.h \
-       server/radeon_macros.h \
-       server/radeon_reg.h \
-       server/radeon_egl.c
-
-COMMON_SYMLINKS = \
-       radeon_chipset.h \
-       radeon_screen.c \
-       radeon_screen.h \
-       radeon_span.h
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####
 
 include ../Makefile.template
 
-server:
-       mkdir -p server
-
-$(SYMLINKS): server
-       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
-
-$(COMMON_SYMLINKS):
-       @[ -e $@ ] || ln -sf ../radeon/$@ ./
-
-symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)
+symlinks: