st: change from ** to * for st_unreference_framebuffer()

[mesa.git] / src / mesa / sources

diff --git a/src/mesa/sources b/src/mesa/sources
index e6b050c3f28b95128a0c10f8a627eef666ec3b57..9a34d1a989f3f31ad1c298b38039ad133338c8ec 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -90,7 +90,7 @@ MATH_SOURCES = \
        math/m_vector.c \
        math/m_xform.c
 
-__SWRAST_SOURCES = \
+SWRAST_SOURCES = \
        swrast/s_aaline.c \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
@@ -121,11 +121,11 @@ __SWRAST_SOURCES = \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
-__SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_SOURCES = \
        swrast_setup/ss_context.c \
        swrast_setup/ss_triangle.c 
 
-__TNL_SOURCES = \
+TNL_SOURCES = \
        tnl/t_context.c \
        tnl/t_pipeline.c \
        tnl/t_draw.c \
@@ -161,52 +161,6 @@ VBO_SOURCES = \
        vbo/vbo_save_draw.c \
        vbo/vbo_save_loopback.c 
 
-__VF_SOURCES = \
-       vf/vf.c \
-       vf/vf_generic.c \
-       vf/vf_sse.c
-
-STATETRACKER_SOURCES = \
-       state_tracker/st_atom.c \
-       state_tracker/st_atom_blend.c \
-       state_tracker/st_atom_clip.c \
-       state_tracker/st_atom_constbuf.c \
-       state_tracker/st_atom_depth.c \
-       state_tracker/st_atom_framebuffer.c \
-       state_tracker/st_atom_pixeltransfer.c \
-       state_tracker/st_atom_sampler.c \
-       state_tracker/st_atom_scissor.c \
-       state_tracker/st_atom_shader.c \
-       state_tracker/st_atom_rasterizer.c \
-       state_tracker/st_atom_stipple.c \
-       state_tracker/st_atom_texture.c \
-       state_tracker/st_atom_viewport.c \
-       state_tracker/st_cb_accum.c \
-       state_tracker/st_cb_bitmap.c \
-       state_tracker/st_cb_blit.c \
-       state_tracker/st_cb_bufferobjects.c \
-       state_tracker/st_cb_clear.c \
-       state_tracker/st_cb_flush.c \
-       state_tracker/st_cb_drawpixels.c \
-       state_tracker/st_cb_fbo.c \
-       state_tracker/st_cb_feedback.c \
-       state_tracker/st_cb_program.c \
-       state_tracker/st_cb_queryobj.c \
-       state_tracker/st_cb_rasterpos.c \
-       state_tracker/st_cb_readpixels.c \
-       state_tracker/st_cb_strings.c \
-       state_tracker/st_cb_texture.c \
-       state_tracker/st_api.c \
-       state_tracker/st_context.c \
-       state_tracker/st_debug.c \
-       state_tracker/st_draw.c \
-       state_tracker/st_extensions.c \
-       state_tracker/st_format.c \
-       state_tracker/st_framebuffer.c \
-       state_tracker/st_gen_mipmap.c \
-       state_tracker/st_mesa_to_tgsi.c \
-       state_tracker/st_program.c \
-       state_tracker/st_texture.c
 
 SHADER_SOURCES = \
        shader/arbprogparse.c \
@@ -256,6 +210,7 @@ ASM_C_SOURCES =     \
        x86/x86.c \
        x86/3dnow.c \
        x86/sse.c \
+       x86/rtasm/x86sse.c \
        sparc/sparc.c \
        ppc/common_ppc.c \
        x86-64/x86-64.c
@@ -296,7 +251,7 @@ SPARC_SOURCES =                     \
 SPARC_API =                    \
        sparc/glapi_sparc.S
 
-__COMMON_DRIVER_SOURCES =                      \
+COMMON_DRIVER_SOURCES =                        \
        drivers/common/driverfuncs.c
 
 
@@ -307,18 +262,18 @@ MESA_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
        $(VBO_SOURCES)          \
-       $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
+       $(COMMON_DRIVER_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
 
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
        $(GLAPI_SOURCES)        \
-       $(MESA_ASM_SOURCES)     \
+       $(MESA_ASM_SOURCES)             \
        $(COMMON_DRIVER_SOURCES)
 
 
@@ -338,11 +293,10 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 
 ### Include directories
+### XXX we should be able to trim this down to just -Iinclude/ and -Isrc/mesa/
+### since most #includes have been changed from #include "mtypes.h" to
+### #include "main/mtypes.h", etc.
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/gallium/include \
-       -I$(TOP)/src/gallium/drivers \
-       -I$(TOP)/src/gallium/auxiliary
+       -I$(TOP)/src/mesa