Tue Nov 18 17:03:58 2008 UTC ()
Split the list of files off Makefile.  libmesa.mk will be used later for
DRI modules.


(cube)
diff -r1.3 -r1.4 src/external/mit/xorg/lib/libOSMesa/Makefile
diff -r0 -r1.1 src/external/mit/xorg/lib/libOSMesa/libmesa.mk

cvs diff -r1.3 -r1.4 src/external/mit/xorg/lib/libOSMesa/Attic/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libOSMesa/Attic/Makefile 2008/11/06 22:28:25 1.3
+++ src/external/mit/xorg/lib/libOSMesa/Attic/Makefile 2008/11/18 17:03:58 1.4
@@ -1,131 +1,22 @@ @@ -1,131 +1,22 @@
1# $NetBSD: Makefile,v 1.3 2008/11/06 22:28:25 veego Exp $ 1# $NetBSD: Makefile,v 1.4 2008/11/18 17:03:58 cube Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= OSMesa 5LIB= OSMesa
6 6
7MESA_SRC_MODULES= main math vbo tnl shader swrast slang glapi common \ 7MESA_SRC_MODULES= main math vbo tnl shader swrast slang glapi common \
8 osmesa 8 osmesa
9 9
10.PATH: ${X11SRCDIR.MesaLib}/include/GL 10.PATH: ${X11SRCDIR.MesaLib}/include/GL
11INCS= osmesa.h 11INCS= osmesa.h
12INCSDIR= ${X11INCDIR}/GL 12INCSDIR= ${X11INCDIR}/GL
13 13
14CPPFLAGS+= ${X11FLAGS.THREADLIB} \ 14CPPFLAGS+= ${X11FLAGS.THREADLIB} \
15 -DPTHREADS -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 \ 15 -DPTHREADS -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31 \
16 -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS 16 -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS
17CFLAGS+= -pthread 17CFLAGS+= -pthread
18 18
19INCLUDES.all= . glapi main 19.include "libmesa.mk"
20 
21# Main sources 
22PATHS.main= main 
23INCLUDES.main= shader 
24SRCS.main= \ 
25 accum.c api_arrayelt.c api_loopback.c api_noop.c api_validate.c \ 
26 arrayobj.c attrib.c blend.c bufferobj.c buffers.c clip.c colortab.c \ 
27 context.c convolve.c debug.c depth.c depthstencil.c dlist.c drawpix.c \ 
28 enable.c enums.c eval.c execmem.c extensions.c fbobject.c feedback.c \ 
29 fog.c framebuffer.c get.c getstring.c hash.c hint.c histogram.c \ 
30 image.c imports.c light.c lines.c matrix.c mipmap.c mm.c pixel.c \ 
31 points.c polygon.c queryobj.c rastpos.c rbadaptors.c renderbuffer.c \ 
32 shaders.c state.c stencil.c texcompress.c texcompress_fxt1.c \ 
33 texcompress_s3tc.c texenvprogram.c texformat.c teximage.c texobj.c \ 
34 texrender.c texstate.c texstore.c varray.c vtxfmt.c 
35 
36# Math sources 
37PATHS.math= math 
38SRCS.math= \ 
39 m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c \ 
40 m_translate.c m_vector.c m_xform.c 
41 
42# VBO sources 
43PATHS.vbo= vbo 
44SRCS.vbo= \ 
45 vbo_context.c vbo_exec.c vbo_exec_api.c vbo_exec_array.c \ 
46 vbo_exec_draw.c vbo_exec_eval.c vbo_rebase.c vbo_split.c \ 
47 vbo_split_copy.c vbo_split_inplace.c vbo_save.c vbo_save_api.c \ 
48 vbo_save_draw.c vbo_save_loopback.c  
49 
50COPTS.vbo_save_draw.c= -Wno-error 
51 
52# TNL sources 
53PATHS.tnl= tnl 
54INCLUDES.tnl= shader 
55SRCS.tnl= \ 
56 t_context.c t_draw.c t_pipeline.c t_vb_cull.c t_vb_fog.c t_vb_light.c \ 
57 t_vb_normals.c t_vb_points.c t_vb_program.c t_vb_render.c \ 
58 t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c t_vertex.c t_vertex_sse.c \ 
59 t_vertex_generic.c t_vp_build.c 
60 
61# Shader sources 
62PATHS.shader= shader shader/grammar 
63INCLUDES.shader= shader/slang shader/grammar 
64SRCS.shader= \ 
65 arbprogparse.c arbprogram.c atifragshader.c grammar_mesa.c \ 
66 nvfragparse.c nvprogram.c nvvertparse.c prog_debug.c prog_execute.c \ 
67 prog_instruction.c prog_parameter.c prog_print.c prog_statevars.c \ 
68 program.c programopt.c shader_api.c 
69 
70# Software raster sources 
71PATHS.swrast= swrast swrast_setup 
72INCLUDES.swrast= shader 
73SRCS.swrast= \ 
74 s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_atifragshader.c \ 
75 s_bitmap.c s_blend.c s_blit.c s_buffers.c s_copypix.c s_context.c \ 
76 s_depth.c s_drawpix.c s_feedback.c s_fog.c s_fragprog.c s_imaging.c \ 
77 s_lines.c s_logic.c s_masking.c s_points.c s_readpix.c s_span.c \ 
78 s_stencil.c s_texcombine.c s_texfilter.c s_texstore.c s_triangle.c \ 
79 s_zoom.c ss_context.c ss_triangle.c  
80 
81# Shader language sources 
82PATHS.slang= shader/slang 
83INCLUDES.slang= shader shader/grammar 
84SRCS.slang= \ 
85 slang_builtin.c slang_codegen.c slang_compile.c \ 
86 slang_compile_function.c slang_compile_operation.c \ 
87 slang_compile_struct.c slang_compile_variable.c slang_emit.c \ 
88 slang_ir.c slang_label.c slang_library_noise.c slang_link.c \ 
89 slang_log.c slang_mem.c slang_preprocess.c slang_print.c \ 
90 slang_simplify.c slang_storage.c slang_typeinfo.c slang_vartable.c \ 
91 slang_utility.c 
92 
93# GL API sources 
94PATHS.glapi= glapi main 
95SRCS.glapi= \ 
96 dispatch.c glapi.c glthread.c 
97 
98# Common driver sources 
99PATHS.common= drivers/common 
100INCLUDES.common= shader 
101SRCS.common= \ 
102 driverfuncs.c 
103 
104# OSMesa driver sources 
105PATHS.osmesa= drivers/osmesa 
106INCLUDES.osmesa= shader 
107SRCS.osmesa= \ 
108 osmesa.c 
109 
110.for _mod_ in ${MESA_SRC_MODULES} 
111 
112SRCS+= ${SRCS.${_mod_}} 
113 
114. for _path_ in ${PATHS.${_mod_}} 
115.PATH: ${X11SRCDIR.MesaLib}/src/mesa/${_path_} 
116. endfor 
117 
118. for _path_ in ${INCLUDES.${_mod_}} 
119CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/${_path_} 
120. endfor 
121 
122.endfor 
123 
124.for _path_ in ${INCLUDES.all} 
125CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/${_path_} 
126.endfor 
127 
128LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm 
129 20
130.include <bsd.x11.mk> 21.include <bsd.x11.mk>
131.include <bsd.lib.mk> 22.include <bsd.lib.mk>

File Added: src/external/mit/xorg/lib/libOSMesa/Attic/libmesa.mk
#	$NetBSD: libmesa.mk,v 1.1 2008/11/18 17:03:58 cube Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.

INCLUDES.all=	. glapi main

# Main sources
PATHS.main=	main
INCLUDES.main=	shader
SRCS.main= \
	accum.c api_arrayelt.c api_loopback.c api_noop.c api_validate.c \
	arrayobj.c attrib.c blend.c bufferobj.c buffers.c clip.c colortab.c \
	context.c convolve.c debug.c depth.c depthstencil.c dlist.c drawpix.c \
	enable.c enums.c eval.c execmem.c extensions.c fbobject.c feedback.c \
	fog.c framebuffer.c get.c getstring.c hash.c hint.c histogram.c \
	image.c imports.c light.c lines.c matrix.c mipmap.c mm.c pixel.c \
	points.c polygon.c queryobj.c rastpos.c rbadaptors.c renderbuffer.c \
	shaders.c state.c stencil.c texcompress.c texcompress_fxt1.c \
	texcompress_s3tc.c texenvprogram.c texformat.c teximage.c texobj.c \
	texrender.c texstate.c texstore.c varray.c vtxfmt.c

# Math sources
PATHS.math=	math
SRCS.math= \
	m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c \
	m_translate.c m_vector.c m_xform.c

# VBO sources
PATHS.vbo=	vbo
SRCS.vbo= \
	vbo_context.c vbo_exec.c vbo_exec_api.c	vbo_exec_array.c \
	vbo_exec_draw.c vbo_exec_eval.c vbo_rebase.c vbo_split.c \
	vbo_split_copy.c vbo_split_inplace.c vbo_save.c vbo_save_api.c \
	vbo_save_draw.c vbo_save_loopback.c 

COPTS.vbo_save_draw.c=	-Wno-error

# TNL sources
PATHS.tnl=	tnl
INCLUDES.tnl=	shader
SRCS.tnl= \
	t_context.c t_draw.c t_pipeline.c t_vb_cull.c t_vb_fog.c t_vb_light.c \
	t_vb_normals.c t_vb_points.c t_vb_program.c t_vb_render.c \
	t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c t_vertex.c t_vertex_sse.c \
	t_vertex_generic.c t_vp_build.c

# Shader sources
PATHS.shader=	shader shader/grammar
INCLUDES.shader=	shader/slang shader/grammar
SRCS.shader= \
	arbprogparse.c arbprogram.c atifragshader.c grammar_mesa.c \
	nvfragparse.c nvprogram.c nvvertparse.c prog_debug.c prog_execute.c \
	prog_instruction.c prog_parameter.c prog_print.c prog_statevars.c \
	program.c programopt.c shader_api.c

# Software raster sources
PATHS.swrast=	swrast swrast_setup
INCLUDES.swrast=	shader
SRCS.swrast= \
	s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_atifragshader.c \
	s_bitmap.c s_blend.c s_blit.c s_buffers.c s_copypix.c s_context.c \
	s_depth.c s_drawpix.c s_feedback.c s_fog.c s_fragprog.c s_imaging.c \
	s_lines.c s_logic.c s_masking.c s_points.c s_readpix.c s_span.c \
	s_stencil.c s_texcombine.c s_texfilter.c s_texstore.c s_triangle.c \
	s_zoom.c ss_context.c ss_triangle.c 

# Shader language sources
PATHS.slang=	shader/slang
INCLUDES.slang=	shader shader/grammar
SRCS.slang= \
	slang_builtin.c	slang_codegen.c	slang_compile.c \
	slang_compile_function.c slang_compile_operation.c \
	slang_compile_struct.c slang_compile_variable.c slang_emit.c \
	slang_ir.c slang_label.c slang_library_noise.c slang_link.c \
	slang_log.c slang_mem.c slang_preprocess.c slang_print.c \
	slang_simplify.c slang_storage.c slang_typeinfo.c slang_vartable.c \
	slang_utility.c

# GL API sources
PATHS.glapi=	glapi main
SRCS.glapi= \
	dispatch.c glapi.c glthread.c

# Common driver sources
PATHS.common=	drivers/common
INCLUDES.common=	shader
SRCS.common= \
	driverfuncs.c

# OSMesa driver sources
PATHS.osmesa=	drivers/osmesa
INCLUDES.osmesa=	shader
SRCS.osmesa= \
	osmesa.c

.for _mod_ in ${MESA_SRC_MODULES}

SRCS+=	${SRCS.${_mod_}}

. for _path_ in ${PATHS.${_mod_}}
.PATH:	${X11SRCDIR.MesaLib}/src/mesa/${_path_}
. endfor

. for _path_ in ${INCLUDES.${_mod_}}
CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/${_path_}
. endfor

.endfor

.for _path_ in ${INCLUDES.all}
CPPFLAGS+=	-I${X11SRCDIR.MesaLib}/src/mesa/${_path_}
.endfor

LIBDPLIBS=	m	${.CURDIR}/../../../../../lib/libm