diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 2 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 25 | ||||
| -rw-r--r-- | src/mesa/Makefile.sources | 1104 | ||||
| -rw-r--r-- | src/mesa/program/Android.mk | 2 |
5 files changed, 562 insertions, 573 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index 2ab593d3cc0..e4a52677cf8 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -32,8 +32,6 @@ LOCAL_PATH := $(call my-dir) # MESA_FILES # X86_FILES include $(LOCAL_PATH)/Makefile.sources -SRCDIR := -BUILDDIR := include $(CLEAR_VARS) diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index 618d6bfb22a..a08366d53eb 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -32,8 +32,6 @@ LOCAL_PATH := $(call my-dir) # MESA_GALLIUM_FILES. # X86_FILES include $(LOCAL_PATH)/Makefile.sources -SRCDIR := -BUILDDIR := include $(CLEAR_VARS) diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 8e7ef0bc7e4..b6cb8f1117b 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -19,6 +19,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = . main/tests if HAVE_X11_DRIVER @@ -36,8 +38,8 @@ endif gldir = $(includedir)/GL gl_HEADERS = $(top_srcdir)/include/GL/*.h -.PHONY: $(BUILDDIR)main/git_sha1.h.tmp -$(BUILDDIR)main/git_sha1.h.tmp: +.PHONY: main/git_sha1.h.tmp +main/git_sha1.h.tmp: @touch main/git_sha1.h.tmp @if test -d $(top_srcdir)/.git; then \ if which git > /dev/null; then \ @@ -47,7 +49,7 @@ $(BUILDDIR)main/git_sha1.h.tmp: fi \ fi -$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp +main/git_sha1.h: main/git_sha1.h.tmp @echo "updating main/git_sha1.h" @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \ mv main/git_sha1.h.tmp main/git_sha1.h ;\ @@ -55,7 +57,6 @@ $(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp rm main/git_sha1.h.tmp ;\ fi -BUILDDIR = $(builddir)/ include Makefile.sources EXTRA_DIST = \ @@ -80,15 +81,15 @@ EXTRA_DIST = \ BUILT_SOURCES = \ main/get_hash.h \ main/format_info.c \ - $(BUILDDIR)main/git_sha1.h \ + main/git_sha1.h \ main/format_pack.c \ main/format_unpack.c \ - $(BUILDDIR)program/program_parse.tab.c \ - $(BUILDDIR)program/lex.yy.c + program/program_parse.tab.c \ + program/lex.yy.c CLEANFILES = \ $(BUILT_SOURCES) \ - $(BUILDDIR)program/program_parse.tab.h \ - $(BUILDDIR)main/git_sha1.h.tmp + program/program_parse.tab.h \ + main/git_sha1.h.tmp GET_HASH_GEN = main/get_hash_generator.py @@ -193,13 +194,13 @@ libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gl.pc -$(BUILDDIR)program/lex.yy.c: program/program_lexer.l +program/lex.yy.c: program/program_lexer.l $(AM_V_at)$(MKDIR_P) program $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< -$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y +program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y $(AM_V_at)$(MKDIR_P) program - $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $< + $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $< if GEN_ASM_OFFSETS matypes.h: $(gen_matypes_SOURCES) diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index b6b3c0cfd9f..720ee5be4e1 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -1,590 +1,584 @@ ### Lists of source files, included by Makefiles -# This file is among different build systems. SRCDIR must be defined with -# a trailing slash because the Android build system leaves it undefined. - -SRCDIR = $(top_srcdir)/src/mesa/ -BUILDDIR = $(top_builddir)/src/mesa/ - # this is part of MAIN_FILES MAIN_ES_FILES = \ - $(SRCDIR)main/es1_conversion.c \ - $(SRCDIR)main/es1_conversion.h + main/es1_conversion.c \ + main/es1_conversion.h MAIN_FILES = \ - $(SRCDIR)main/accum.c \ - $(SRCDIR)main/accum.h \ - $(SRCDIR)main/api_arrayelt.c \ - $(SRCDIR)main/api_arrayelt.h \ - $(BUILDDIR)main/api_exec.c \ - $(SRCDIR)main/api_exec.h \ - $(SRCDIR)main/api_loopback.c \ - $(SRCDIR)main/api_loopback.h \ - $(SRCDIR)main/api_validate.c \ - $(SRCDIR)main/api_validate.h \ - $(SRCDIR)main/arbprogram.c \ - $(SRCDIR)main/arbprogram.h \ - $(SRCDIR)main/arrayobj.c \ - $(SRCDIR)main/arrayobj.h \ - $(SRCDIR)main/atifragshader.c \ - $(SRCDIR)main/atifragshader.h \ - $(SRCDIR)main/attrib.c \ - $(SRCDIR)main/attrib.h \ - $(SRCDIR)main/bitset.h \ - $(SRCDIR)main/blend.c \ - $(SRCDIR)main/blend.h \ - $(SRCDIR)main/blit.c \ - $(SRCDIR)main/blit.h \ - $(SRCDIR)main/bufferobj.c \ - $(SRCDIR)main/bufferobj.h \ - $(SRCDIR)main/buffers.c \ - $(SRCDIR)main/buffers.h \ - $(SRCDIR)main/clear.c \ - $(SRCDIR)main/clear.h \ - $(SRCDIR)main/clip.c \ - $(SRCDIR)main/clip.h \ - $(SRCDIR)main/colormac.h \ - $(SRCDIR)main/colortab.c \ - $(SRCDIR)main/colortab.h \ - $(SRCDIR)main/compute.c \ - $(SRCDIR)main/compute.h \ - $(SRCDIR)main/compiler.h \ - $(SRCDIR)main/condrender.c \ - $(SRCDIR)main/condrender.h \ - $(SRCDIR)main/config.h \ - $(SRCDIR)main/context.c \ - $(SRCDIR)main/context.h \ - $(SRCDIR)main/convolve.c \ - $(SRCDIR)main/convolve.h \ - $(SRCDIR)main/copyimage.c \ - $(SRCDIR)main/copyimage.h \ - $(SRCDIR)main/core.h \ - $(SRCDIR)main/cpuinfo.c \ - $(SRCDIR)main/cpuinfo.h \ - $(SRCDIR)main/dd.h \ - $(SRCDIR)main/debug.c \ - $(SRCDIR)main/debug.h \ - $(SRCDIR)main/depth.c \ - $(SRCDIR)main/depth.h \ - $(SRCDIR)main/dlist.c \ - $(SRCDIR)main/dlist.h \ - $(SRCDIR)main/dlopen.h \ - $(SRCDIR)main/drawpix.c \ - $(SRCDIR)main/drawpix.h \ - $(SRCDIR)main/drawtex.c \ - $(SRCDIR)main/drawtex.h \ - $(SRCDIR)main/enable.c \ - $(SRCDIR)main/enable.h \ - $(BUILDDIR)main/enums.c \ - $(SRCDIR)main/enums.h \ - $(SRCDIR)main/errors.c \ - $(SRCDIR)main/errors.h \ - $(SRCDIR)main/eval.c \ - $(SRCDIR)main/eval.h \ - $(SRCDIR)main/execmem.c \ - $(SRCDIR)main/extensions.c \ - $(SRCDIR)main/extensions.h \ - $(SRCDIR)main/fbobject.c \ - $(SRCDIR)main/fbobject.h \ - $(SRCDIR)main/feedback.c \ - $(SRCDIR)main/feedback.h \ - $(SRCDIR)main/ff_fragment_shader.cpp \ - $(SRCDIR)main/ffvertex_prog.c \ - $(SRCDIR)main/ffvertex_prog.h \ - $(SRCDIR)main/fog.c \ - $(SRCDIR)main/fog.h \ - $(SRCDIR)main/format_pack.h \ - $(BUILDDIR)main/format_pack.c \ - $(SRCDIR)main/format_unpack.h \ - $(BUILDDIR)main/format_unpack.c \ - $(SRCDIR)main/formatquery.c \ - $(SRCDIR)main/formatquery.h \ - $(SRCDIR)main/formats.c \ - $(SRCDIR)main/formats.h \ - $(SRCDIR)main/format_utils.c \ - $(SRCDIR)main/format_utils.h \ - $(SRCDIR)main/framebuffer.c \ - $(SRCDIR)main/framebuffer.h \ - $(SRCDIR)main/get.c \ - $(SRCDIR)main/get.h \ - $(SRCDIR)main/genmipmap.c \ - $(SRCDIR)main/genmipmap.h \ - $(SRCDIR)main/getstring.c \ - $(SRCDIR)main/glformats.c \ - $(SRCDIR)main/glformats.h \ - $(SRCDIR)main/glheader.h \ - $(SRCDIR)main/hash.c \ - $(SRCDIR)main/hash.h \ - $(SRCDIR)main/hint.c \ - $(SRCDIR)main/hint.h \ - $(SRCDIR)main/histogram.c \ - $(SRCDIR)main/histogram.h \ - $(SRCDIR)main/image.c \ - $(SRCDIR)main/image.h \ - $(SRCDIR)main/imports.c \ - $(SRCDIR)main/imports.h \ - $(SRCDIR)main/light.c \ - $(SRCDIR)main/light.h \ - $(SRCDIR)main/lines.c \ - $(SRCDIR)main/lines.h \ - $(SRCDIR)main/macros.h \ - $(SRCDIR)main/matrix.c \ - $(SRCDIR)main/matrix.h \ - $(SRCDIR)main/mipmap.c \ - $(SRCDIR)main/mipmap.h \ - $(SRCDIR)main/mm.c \ - $(SRCDIR)main/mm.h \ - $(SRCDIR)main/mtypes.h \ - $(SRCDIR)main/multisample.c \ - $(SRCDIR)main/multisample.h \ - $(SRCDIR)main/objectlabel.c \ - $(SRCDIR)main/objectlabel.h \ - $(SRCDIR)main/pack.c \ - $(SRCDIR)main/pack.h \ - $(SRCDIR)main/pbo.c \ - $(SRCDIR)main/pbo.h \ - $(SRCDIR)main/performance_monitor.c \ - $(SRCDIR)main/performance_monitor.h \ - $(SRCDIR)main/pipelineobj.c \ - $(SRCDIR)main/pipelineobj.h \ - $(SRCDIR)main/pixel.c \ - $(SRCDIR)main/pixel.h \ - $(SRCDIR)main/pixelstore.c \ - $(SRCDIR)main/pixelstore.h \ - $(SRCDIR)main/pixeltransfer.c \ - $(SRCDIR)main/pixeltransfer.h \ - $(SRCDIR)main/points.c \ - $(SRCDIR)main/points.h \ - $(SRCDIR)main/polygon.c \ - $(SRCDIR)main/polygon.h \ - $(SRCDIR)main/querymatrix.c \ - $(SRCDIR)main/querymatrix.h \ - $(SRCDIR)main/queryobj.c \ - $(SRCDIR)main/queryobj.h \ - $(SRCDIR)main/rastpos.c \ - $(SRCDIR)main/rastpos.h \ - $(SRCDIR)main/readpix.c \ - $(SRCDIR)main/readpix.h \ - $(SRCDIR)main/remap.c \ - $(SRCDIR)main/remap.h \ - $(SRCDIR)main/renderbuffer.c \ - $(SRCDIR)main/renderbuffer.h \ - $(SRCDIR)main/samplerobj.c \ - $(SRCDIR)main/samplerobj.h \ - $(SRCDIR)main/scissor.c \ - $(SRCDIR)main/scissor.h \ - $(SRCDIR)main/shaderapi.c \ - $(SRCDIR)main/shaderapi.h \ - $(SRCDIR)main/shaderimage.c \ - $(SRCDIR)main/shaderimage.h \ - $(SRCDIR)main/shaderobj.c \ - $(SRCDIR)main/shaderobj.h \ - $(SRCDIR)main/shader_query.cpp \ - $(SRCDIR)main/shared.c \ - $(SRCDIR)main/shared.h \ - $(SRCDIR)main/simple_list.h \ - $(SRCDIR)main/state.c \ - $(SRCDIR)main/state.h \ - $(SRCDIR)main/stencil.c \ - $(SRCDIR)main/stencil.h \ - $(SRCDIR)main/syncobj.c \ - $(SRCDIR)main/syncobj.h \ - $(SRCDIR)main/texcompress.c \ - $(SRCDIR)main/texcompress_bptc.c \ - $(SRCDIR)main/texcompress_bptc.h \ - $(SRCDIR)main/texcompress_cpal.c \ - $(SRCDIR)main/texcompress_cpal.h \ - $(SRCDIR)main/texcompress_etc.c \ - $(SRCDIR)main/texcompress_etc.h \ - $(SRCDIR)main/texcompress_etc_tmp.h \ - $(SRCDIR)main/texcompress_fxt1.c \ - $(SRCDIR)main/texcompress_fxt1.h \ - $(SRCDIR)main/texcompress.h \ - $(SRCDIR)main/texcompress_rgtc.c \ - $(SRCDIR)main/texcompress_rgtc.h \ - $(SRCDIR)main/texcompress_s3tc.c \ - $(SRCDIR)main/texcompress_s3tc.h \ - $(SRCDIR)main/texenv.c \ - $(SRCDIR)main/texenv.h \ - $(SRCDIR)main/texenvprogram.h \ - $(SRCDIR)main/texformat.c \ - $(SRCDIR)main/texformat.h \ - $(SRCDIR)main/texgen.c \ - $(SRCDIR)main/texgen.h \ - $(SRCDIR)main/texgetimage.c \ - $(SRCDIR)main/texgetimage.h \ - $(SRCDIR)main/teximage.c \ - $(SRCDIR)main/teximage.h \ - $(SRCDIR)main/texobj.c \ - $(SRCDIR)main/texobj.h \ - $(SRCDIR)main/texparam.c \ - $(SRCDIR)main/texparam.h \ - $(SRCDIR)main/texstate.c \ - $(SRCDIR)main/texstate.h \ - $(SRCDIR)main/texstorage.c \ - $(SRCDIR)main/texstorage.h \ - $(SRCDIR)main/texstore.c \ - $(SRCDIR)main/texstore.h \ - $(SRCDIR)main/textureview.c \ - $(SRCDIR)main/textureview.h \ - $(SRCDIR)main/texturebarrier.c \ - $(SRCDIR)main/texturebarrier.h \ - $(SRCDIR)main/transformfeedback.c \ - $(SRCDIR)main/transformfeedback.h \ - $(SRCDIR)main/uniform_query.cpp \ - $(SRCDIR)main/uniforms.c \ - $(SRCDIR)main/uniforms.h \ - $(SRCDIR)main/varray.c \ - $(SRCDIR)main/varray.h \ - $(SRCDIR)main/vdpau.c \ - $(SRCDIR)main/vdpau.h \ - $(SRCDIR)main/version.c \ - $(SRCDIR)main/version.h \ - $(SRCDIR)main/viewport.c \ - $(SRCDIR)main/viewport.h \ - $(SRCDIR)main/vtxfmt.c \ - $(SRCDIR)main/vtxfmt.h \ + main/accum.c \ + main/accum.h \ + main/api_arrayelt.c \ + main/api_arrayelt.h \ + main/api_exec.c \ + main/api_exec.h \ + main/api_loopback.c \ + main/api_loopback.h \ + main/api_validate.c \ + main/api_validate.h \ + main/arbprogram.c \ + main/arbprogram.h \ + main/arrayobj.c \ + main/arrayobj.h \ + main/atifragshader.c \ + main/atifragshader.h \ + main/attrib.c \ + main/attrib.h \ + main/bitset.h \ + main/blend.c \ + main/blend.h \ + main/blit.c \ + main/blit.h \ + main/bufferobj.c \ + main/bufferobj.h \ + main/buffers.c \ + main/buffers.h \ + main/clear.c \ + main/clear.h \ + main/clip.c \ + main/clip.h \ + main/colormac.h \ + main/colortab.c \ + main/colortab.h \ + main/compute.c \ + main/compute.h \ + main/compiler.h \ + main/condrender.c \ + main/condrender.h \ + main/config.h \ + main/context.c \ + main/context.h \ + main/convolve.c \ + main/convolve.h \ + main/copyimage.c \ + main/copyimage.h \ + main/core.h \ + main/cpuinfo.c \ + main/cpuinfo.h \ + main/dd.h \ + main/debug.c \ + main/debug.h \ + main/depth.c \ + main/depth.h \ + main/dlist.c \ + main/dlist.h \ + main/dlopen.h \ + main/drawpix.c \ + main/drawpix.h \ + main/drawtex.c \ + main/drawtex.h \ + main/enable.c \ + main/enable.h \ + main/enums.c \ + main/enums.h \ + main/errors.c \ + main/errors.h \ + main/eval.c \ + main/eval.h \ + main/execmem.c \ + main/extensions.c \ + main/extensions.h \ + main/fbobject.c \ + main/fbobject.h \ + main/feedback.c \ + main/feedback.h \ + main/ff_fragment_shader.cpp \ + main/ffvertex_prog.c \ + main/ffvertex_prog.h \ + main/fog.c \ + main/fog.h \ + main/format_pack.h \ + main/format_pack.c \ + main/format_unpack.h \ + main/format_unpack.c \ + main/formatquery.c \ + main/formatquery.h \ + main/formats.c \ + main/formats.h \ + main/format_utils.c \ + main/format_utils.h \ + main/framebuffer.c \ + main/framebuffer.h \ + main/get.c \ + main/get.h \ + main/genmipmap.c \ + main/genmipmap.h \ + main/getstring.c \ + main/glformats.c \ + main/glformats.h \ + main/glheader.h \ + main/hash.c \ + main/hash.h \ + main/hint.c \ + main/hint.h \ + main/histogram.c \ + main/histogram.h \ + main/image.c \ + main/image.h \ + main/imports.c \ + main/imports.h \ + main/light.c \ + main/light.h \ + main/lines.c \ + main/lines.h \ + main/macros.h \ + main/matrix.c \ + main/matrix.h \ + main/mipmap.c \ + main/mipmap.h \ + main/mm.c \ + main/mm.h \ + main/mtypes.h \ + main/multisample.c \ + main/multisample.h \ + main/objectlabel.c \ + main/objectlabel.h \ + main/pack.c \ + main/pack.h \ + main/pbo.c \ + main/pbo.h \ + main/performance_monitor.c \ + main/performance_monitor.h \ + main/pipelineobj.c \ + main/pipelineobj.h \ + main/pixel.c \ + main/pixel.h \ + main/pixelstore.c \ + main/pixelstore.h \ + main/pixeltransfer.c \ + main/pixeltransfer.h \ + main/points.c \ + main/points.h \ + main/polygon.c \ + main/polygon.h \ + main/querymatrix.c \ + main/querymatrix.h \ + main/queryobj.c \ + main/queryobj.h \ + main/rastpos.c \ + main/rastpos.h \ + main/readpix.c \ + main/readpix.h \ + main/remap.c \ + main/remap.h \ + main/renderbuffer.c \ + main/renderbuffer.h \ + main/samplerobj.c \ + main/samplerobj.h \ + main/scissor.c \ + main/scissor.h \ + main/shaderapi.c \ + main/shaderapi.h \ + main/shaderimage.c \ + main/shaderimage.h \ + main/shaderobj.c \ + main/shaderobj.h \ + main/shader_query.cpp \ + main/shared.c \ + main/shared.h \ + main/simple_list.h \ + main/state.c \ + main/state.h \ + main/stencil.c \ + main/stencil.h \ + main/syncobj.c \ + main/syncobj.h \ + main/texcompress.c \ + main/texcompress_bptc.c \ + main/texcompress_bptc.h \ + main/texcompress_cpal.c \ + main/texcompress_cpal.h \ + main/texcompress_etc.c \ + main/texcompress_etc.h \ + main/texcompress_etc_tmp.h \ + main/texcompress_fxt1.c \ + main/texcompress_fxt1.h \ + main/texcompress.h \ + main/texcompress_rgtc.c \ + main/texcompress_rgtc.h \ + main/texcompress_s3tc.c \ + main/texcompress_s3tc.h \ + main/texenv.c \ + main/texenv.h \ + main/texenvprogram.h \ + main/texformat.c \ + main/texformat.h \ + main/texgen.c \ + main/texgen.h \ + main/texgetimage.c \ + main/texgetimage.h \ + main/teximage.c \ + main/teximage.h \ + main/texobj.c \ + main/texobj.h \ + main/texparam.c \ + main/texparam.h \ + main/texstate.c \ + main/texstate.h \ + main/texstorage.c \ + main/texstorage.h \ + main/texstore.c \ + main/texstore.h \ + main/textureview.c \ + main/textureview.h \ + main/texturebarrier.c \ + main/texturebarrier.h \ + main/transformfeedback.c \ + main/transformfeedback.h \ + main/uniform_query.cpp \ + main/uniforms.c \ + main/uniforms.h \ + main/varray.c \ + main/varray.h \ + main/vdpau.c \ + main/vdpau.h \ + main/version.c \ + main/version.h \ + main/viewport.c \ + main/viewport.h \ + main/vtxfmt.c \ + main/vtxfmt.h \ $(MAIN_ES_FILES) MATH_FILES = \ - $(SRCDIR)math/m_debug.h \ - $(SRCDIR)math/m_debug_clip.c \ - $(SRCDIR)math/m_debug_norm.c \ - $(SRCDIR)math/m_debug_util.h \ - $(SRCDIR)math/m_debug_xform.c \ - $(SRCDIR)math/m_eval.c \ - $(SRCDIR)math/m_eval.h \ - $(SRCDIR)math/m_matrix.c \ - $(SRCDIR)math/m_matrix.h \ - $(SRCDIR)math/m_trans_tmp.h \ - $(SRCDIR)math/m_translate.c \ - $(SRCDIR)math/m_translate.h \ - $(SRCDIR)math/m_vector.c \ - $(SRCDIR)math/m_vector.h + math/m_debug.h \ + math/m_debug_clip.c \ + math/m_debug_norm.c \ + math/m_debug_util.h \ + math/m_debug_xform.c \ + math/m_eval.c \ + math/m_eval.h \ + math/m_matrix.c \ + math/m_matrix.h \ + math/m_trans_tmp.h \ + math/m_translate.c \ + math/m_translate.h \ + math/m_vector.c \ + math/m_vector.h MATH_XFORM_FILES = \ - $(SRCDIR)math/m_clip_tmp.h \ - $(SRCDIR)math/m_copy_tmp.h \ - $(SRCDIR)math/m_dotprod_tmp.h \ - $(SRCDIR)math/m_norm_tmp.h \ - $(SRCDIR)math/m_xform.c \ - $(SRCDIR)math/m_xform.h \ - $(SRCDIR)math/m_xform_tmp.h + math/m_clip_tmp.h \ + math/m_copy_tmp.h \ + math/m_dotprod_tmp.h \ + math/m_norm_tmp.h \ + math/m_xform.c \ + math/m_xform.h \ + math/m_xform_tmp.h SWRAST_FILES = \ - $(SRCDIR)swrast/s_aaline.c \ - $(SRCDIR)swrast/s_aaline.h \ - $(SRCDIR)swrast/s_aalinetemp.h \ - $(SRCDIR)swrast/s_aatriangle.c \ - $(SRCDIR)swrast/s_aatriangle.h \ - $(SRCDIR)swrast/s_aatritemp.h \ - $(SRCDIR)swrast/s_alpha.c \ - $(SRCDIR)swrast/s_alpha.h \ - $(SRCDIR)swrast/s_atifragshader.c \ - $(SRCDIR)swrast/s_atifragshader.h \ - $(SRCDIR)swrast/s_bitmap.c \ - $(SRCDIR)swrast/s_blend.c \ - $(SRCDIR)swrast/s_blend.h \ - $(SRCDIR)swrast/s_blit.c \ - $(SRCDIR)swrast/s_chan.h \ - $(SRCDIR)swrast/s_clear.c \ - $(SRCDIR)swrast/s_context.c \ - $(SRCDIR)swrast/s_context.h \ - $(SRCDIR)swrast/s_copypix.c \ - $(SRCDIR)swrast/s_depth.c \ - $(SRCDIR)swrast/s_depth.h \ - $(SRCDIR)swrast/s_drawpix.c \ - $(SRCDIR)swrast_setup/ss_tritmp.h \ - $(SRCDIR)swrast_setup/ss_vb.h \ - $(SRCDIR)swrast_setup/swrast_setup.h \ - $(SRCDIR)swrast/s_feedback.c \ - $(SRCDIR)swrast/s_feedback.h \ - $(SRCDIR)swrast/s_fog.c \ - $(SRCDIR)swrast/s_fog.h \ - $(SRCDIR)swrast/s_fragprog.c \ - $(SRCDIR)swrast/s_fragprog.h \ - $(SRCDIR)swrast/s_lines.c \ - $(SRCDIR)swrast/s_lines.h \ - $(SRCDIR)swrast/s_linetemp.h \ - $(SRCDIR)swrast/s_logic.c \ - $(SRCDIR)swrast/s_logic.h \ - $(SRCDIR)swrast/s_masking.c \ - $(SRCDIR)swrast/s_masking.h \ - $(SRCDIR)swrast/s_points.c \ - $(SRCDIR)swrast/s_points.h \ - $(SRCDIR)swrast/s_renderbuffer.c \ - $(SRCDIR)swrast/s_renderbuffer.h \ - $(SRCDIR)swrast/s_span.c \ - $(SRCDIR)swrast/s_span.h \ - $(SRCDIR)swrast/s_stencil.c \ - $(SRCDIR)swrast/s_stencil.h \ - $(SRCDIR)swrast/s_texcombine.c \ - $(SRCDIR)swrast/s_texcombine.h \ - $(SRCDIR)swrast/s_texfetch.c \ - $(SRCDIR)swrast/s_texfetch.h \ - $(SRCDIR)swrast/s_texfetch_tmp.h \ - $(SRCDIR)swrast/s_texfilter.c \ - $(SRCDIR)swrast/s_texfilter.h \ - $(SRCDIR)swrast/s_texrender.c \ - $(SRCDIR)swrast/s_texture.c \ - $(SRCDIR)swrast/s_triangle.c \ - $(SRCDIR)swrast/s_triangle.h \ - $(SRCDIR)swrast/s_tritemp.h \ - $(SRCDIR)swrast/swrast.h \ - $(SRCDIR)swrast/s_zoom.c \ - $(SRCDIR)swrast/s_zoom.h + swrast/s_aaline.c \ + swrast/s_aaline.h \ + swrast/s_aalinetemp.h \ + swrast/s_aatriangle.c \ + swrast/s_aatriangle.h \ + swrast/s_aatritemp.h \ + swrast/s_alpha.c \ + swrast/s_alpha.h \ + swrast/s_atifragshader.c \ + swrast/s_atifragshader.h \ + swrast/s_bitmap.c \ + swrast/s_blend.c \ + swrast/s_blend.h \ + swrast/s_blit.c \ + swrast/s_chan.h \ + swrast/s_clear.c \ + swrast/s_context.c \ + swrast/s_context.h \ + swrast/s_copypix.c \ + swrast/s_depth.c \ + swrast/s_depth.h \ + swrast/s_drawpix.c \ + swrast_setup/ss_tritmp.h \ + swrast_setup/ss_vb.h \ + swrast_setup/swrast_setup.h \ + swrast/s_feedback.c \ + swrast/s_feedback.h \ + swrast/s_fog.c \ + swrast/s_fog.h \ + swrast/s_fragprog.c \ + swrast/s_fragprog.h \ + swrast/s_lines.c \ + swrast/s_lines.h \ + swrast/s_linetemp.h \ + swrast/s_logic.c \ + swrast/s_logic.h \ + swrast/s_masking.c \ + swrast/s_masking.h \ + swrast/s_points.c \ + swrast/s_points.h \ + swrast/s_renderbuffer.c \ + swrast/s_renderbuffer.h \ + swrast/s_span.c \ + swrast/s_span.h \ + swrast/s_stencil.c \ + swrast/s_stencil.h \ + swrast/s_texcombine.c \ + swrast/s_texcombine.h \ + swrast/s_texfetch.c \ + swrast/s_texfetch.h \ + swrast/s_texfetch_tmp.h \ + swrast/s_texfilter.c \ + swrast/s_texfilter.h \ + swrast/s_texrender.c \ + swrast/s_texture.c \ + swrast/s_triangle.c \ + swrast/s_triangle.h \ + swrast/s_tritemp.h \ + swrast/swrast.h \ + swrast/s_zoom.c \ + swrast/s_zoom.h SWRAST_SETUP_FILES = \ - $(SRCDIR)swrast_setup/ss_context.c \ - $(SRCDIR)swrast_setup/ss_context.h \ - $(SRCDIR)swrast_setup/ss_triangle.c \ - $(SRCDIR)swrast_setup/ss_triangle.h + swrast_setup/ss_context.c \ + swrast_setup/ss_context.h \ + swrast_setup/ss_triangle.c \ + swrast_setup/ss_triangle.h TNL_FILES = \ - $(SRCDIR)tnl/t_context.c \ - $(SRCDIR)tnl/t_context.h \ - $(SRCDIR)tnl/t_draw.c \ - $(SRCDIR)tnl/tnl.h \ - $(SRCDIR)tnl/t_pipeline.c \ - $(SRCDIR)tnl/t_pipeline.h \ - $(SRCDIR)tnl/t_rasterpos.c \ - $(SRCDIR)tnl/t_vb_cliptmp.h \ - $(SRCDIR)tnl/t_vb_fog.c \ - $(SRCDIR)tnl/t_vb_light.c \ - $(SRCDIR)tnl/t_vb_lighttmp.h \ - $(SRCDIR)tnl/t_vb_normals.c \ - $(SRCDIR)tnl/t_vb_points.c \ - $(SRCDIR)tnl/t_vb_program.c \ - $(SRCDIR)tnl/t_vb_render.c \ - $(SRCDIR)tnl/t_vb_rendertmp.h \ - $(SRCDIR)tnl/t_vb_texgen.c \ - $(SRCDIR)tnl/t_vb_texmat.c \ - $(SRCDIR)tnl/t_vb_vertex.c \ - $(SRCDIR)tnl/t_vertex.c \ - $(SRCDIR)tnl/t_vertex_generic.c \ - $(SRCDIR)tnl/t_vertex.h \ - $(SRCDIR)tnl/t_vertex_sse.c \ - $(SRCDIR)tnl/t_vp_build.c \ - $(SRCDIR)tnl/t_vp_build.h + tnl/t_context.c \ + tnl/t_context.h \ + tnl/t_draw.c \ + tnl/tnl.h \ + tnl/t_pipeline.c \ + tnl/t_pipeline.h \ + tnl/t_rasterpos.c \ + tnl/t_vb_cliptmp.h \ + tnl/t_vb_fog.c \ + tnl/t_vb_light.c \ + tnl/t_vb_lighttmp.h \ + tnl/t_vb_normals.c \ + tnl/t_vb_points.c \ + tnl/t_vb_program.c \ + tnl/t_vb_render.c \ + tnl/t_vb_rendertmp.h \ + tnl/t_vb_texgen.c \ + tnl/t_vb_texmat.c \ + tnl/t_vb_vertex.c \ + tnl/t_vertex.c \ + tnl/t_vertex_generic.c \ + tnl/t_vertex.h \ + tnl/t_vertex_sse.c \ + tnl/t_vp_build.c \ + tnl/t_vp_build.h VBO_FILES = \ - $(SRCDIR)vbo/vbo_attrib.h \ - $(SRCDIR)vbo/vbo_attrib_tmp.h \ - $(SRCDIR)vbo/vbo_context.c \ - $(SRCDIR)vbo/vbo_context.h \ - $(SRCDIR)vbo/vbo_exec_api.c \ - $(SRCDIR)vbo/vbo_exec_array.c \ - $(SRCDIR)vbo/vbo_exec.c \ - $(SRCDIR)vbo/vbo_exec_draw.c \ - $(SRCDIR)vbo/vbo_exec_eval.c \ - $(SRCDIR)vbo/vbo_exec.h \ - $(SRCDIR)vbo/vbo.h \ - $(SRCDIR)vbo/vbo_noop.c \ - $(SRCDIR)vbo/vbo_noop.h \ - $(SRCDIR)vbo/vbo_primitive_restart.c \ - $(SRCDIR)vbo/vbo_rebase.c \ - $(SRCDIR)vbo/vbo_save_api.c \ - $(SRCDIR)vbo/vbo_save.c \ - $(SRCDIR)vbo/vbo_save_draw.c \ - $(SRCDIR)vbo/vbo_save.h \ - $(SRCDIR)vbo/vbo_save_loopback.c \ - $(SRCDIR)vbo/vbo_split.c \ - $(SRCDIR)vbo/vbo_split_copy.c \ - $(SRCDIR)vbo/vbo_split.h \ - $(SRCDIR)vbo/vbo_split_inplace.c + vbo/vbo_attrib.h \ + vbo/vbo_attrib_tmp.h \ + vbo/vbo_context.c \ + vbo/vbo_context.h \ + vbo/vbo_exec_api.c \ + vbo/vbo_exec_array.c \ + vbo/vbo_exec.c \ + vbo/vbo_exec_draw.c \ + vbo/vbo_exec_eval.c \ + vbo/vbo_exec.h \ + vbo/vbo.h \ + vbo/vbo_noop.c \ + vbo/vbo_noop.h \ + vbo/vbo_primitive_restart.c \ + vbo/vbo_rebase.c \ + vbo/vbo_save_api.c \ + vbo/vbo_save.c \ + vbo/vbo_save_draw.c \ + vbo/vbo_save.h \ + vbo/vbo_save_loopback.c \ + vbo/vbo_split.c \ + vbo/vbo_split_copy.c \ + vbo/vbo_split.h \ + vbo/vbo_split_inplace.c STATETRACKER_FILES = \ - $(SRCDIR)state_tracker/st_atom_array.c \ - $(SRCDIR)state_tracker/st_atom_blend.c \ - $(SRCDIR)state_tracker/st_atom.c \ - $(SRCDIR)state_tracker/st_atom_clip.c \ - $(SRCDIR)state_tracker/st_atom_constbuf.c \ - $(SRCDIR)state_tracker/st_atom_constbuf.h \ - $(SRCDIR)state_tracker/st_atom_depth.c \ - $(SRCDIR)state_tracker/st_atom_framebuffer.c \ - $(SRCDIR)state_tracker/st_atom.h \ - $(SRCDIR)state_tracker/st_atom_msaa.c \ - $(SRCDIR)state_tracker/st_atom_pixeltransfer.c \ - $(SRCDIR)state_tracker/st_atom_rasterizer.c \ - $(SRCDIR)state_tracker/st_atom_sampler.c \ - $(SRCDIR)state_tracker/st_atom_scissor.c \ - $(SRCDIR)state_tracker/st_atom_shader.c \ - $(SRCDIR)state_tracker/st_atom_shader.h \ - $(SRCDIR)state_tracker/st_atom_stipple.c \ - $(SRCDIR)state_tracker/st_atom_texture.c \ - $(SRCDIR)state_tracker/st_atom_viewport.c \ - $(SRCDIR)state_tracker/st_cache.h \ - $(SRCDIR)state_tracker/st_cb_bitmap.c \ - $(SRCDIR)state_tracker/st_cb_bitmap.h \ - $(SRCDIR)state_tracker/st_cb_blit.c \ - $(SRCDIR)state_tracker/st_cb_blit.h \ - $(SRCDIR)state_tracker/st_cb_bufferobjects.c \ - $(SRCDIR)state_tracker/st_cb_bufferobjects.h \ - $(SRCDIR)state_tracker/st_cb_clear.c \ - $(SRCDIR)state_tracker/st_cb_clear.h \ - $(SRCDIR)state_tracker/st_cb_condrender.c \ - $(SRCDIR)state_tracker/st_cb_condrender.h \ - $(SRCDIR)state_tracker/st_cb_drawpixels.c \ - $(SRCDIR)state_tracker/st_cb_drawpixels.h \ - $(SRCDIR)state_tracker/st_cb_drawtex.c \ - $(SRCDIR)state_tracker/st_cb_drawtex.h \ - $(SRCDIR)state_tracker/st_cb_eglimage.c \ - $(SRCDIR)state_tracker/st_cb_eglimage.h \ - $(SRCDIR)state_tracker/st_cb_fbo.c \ - $(SRCDIR)state_tracker/st_cb_fbo.h \ - $(SRCDIR)state_tracker/st_cb_feedback.c \ - $(SRCDIR)state_tracker/st_cb_feedback.h \ - $(SRCDIR)state_tracker/st_cb_flush.c \ - $(SRCDIR)state_tracker/st_cb_flush.h \ - $(SRCDIR)state_tracker/st_cb_msaa.c \ - $(SRCDIR)state_tracker/st_cb_msaa.h \ - $(SRCDIR)state_tracker/st_cb_program.c \ - $(SRCDIR)state_tracker/st_cb_program.h \ - $(SRCDIR)state_tracker/st_cb_queryobj.c \ - $(SRCDIR)state_tracker/st_cb_queryobj.h \ - $(SRCDIR)state_tracker/st_cb_rasterpos.c \ - $(SRCDIR)state_tracker/st_cb_rasterpos.h \ - $(SRCDIR)state_tracker/st_cb_readpixels.c \ - $(SRCDIR)state_tracker/st_cb_readpixels.h \ - $(SRCDIR)state_tracker/st_cb_strings.c \ - $(SRCDIR)state_tracker/st_cb_strings.h \ - $(SRCDIR)state_tracker/st_cb_syncobj.c \ - $(SRCDIR)state_tracker/st_cb_syncobj.h \ - $(SRCDIR)state_tracker/st_cb_texturebarrier.c \ - $(SRCDIR)state_tracker/st_cb_texturebarrier.h \ - $(SRCDIR)state_tracker/st_cb_texture.c \ - $(SRCDIR)state_tracker/st_cb_texture.h \ - $(SRCDIR)state_tracker/st_cb_viewport.c \ - $(SRCDIR)state_tracker/st_cb_viewport.h \ - $(SRCDIR)state_tracker/st_cb_xformfb.c \ - $(SRCDIR)state_tracker/st_cb_xformfb.h \ - $(SRCDIR)state_tracker/st_context.c \ - $(SRCDIR)state_tracker/st_context.h \ - $(SRCDIR)state_tracker/st_debug.c \ - $(SRCDIR)state_tracker/st_debug.h \ - $(SRCDIR)state_tracker/st_draw.c \ - $(SRCDIR)state_tracker/st_draw_feedback.c \ - $(SRCDIR)state_tracker/st_draw.h \ - $(SRCDIR)state_tracker/st_extensions.c \ - $(SRCDIR)state_tracker/st_extensions.h \ - $(SRCDIR)state_tracker/st_format.c \ - $(SRCDIR)state_tracker/st_format.h \ - $(SRCDIR)state_tracker/st_gen_mipmap.c \ - $(SRCDIR)state_tracker/st_gen_mipmap.h \ - $(SRCDIR)state_tracker/st_gl_api.h \ - $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \ - $(SRCDIR)state_tracker/st_glsl_to_tgsi.h \ - $(SRCDIR)state_tracker/st_manager.c \ - $(SRCDIR)state_tracker/st_manager.h \ - $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \ - $(SRCDIR)state_tracker/st_mesa_to_tgsi.h \ - $(SRCDIR)state_tracker/st_program.c \ - $(SRCDIR)state_tracker/st_program.h \ - $(SRCDIR)state_tracker/st_texture.c \ - $(SRCDIR)state_tracker/st_texture.h \ - $(SRCDIR)state_tracker/st_vdpau.c \ - $(SRCDIR)state_tracker/st_vdpau.h + state_tracker/st_atom_array.c \ + state_tracker/st_atom_blend.c \ + state_tracker/st_atom.c \ + state_tracker/st_atom_clip.c \ + state_tracker/st_atom_constbuf.c \ + state_tracker/st_atom_constbuf.h \ + state_tracker/st_atom_depth.c \ + state_tracker/st_atom_framebuffer.c \ + state_tracker/st_atom.h \ + state_tracker/st_atom_msaa.c \ + state_tracker/st_atom_pixeltransfer.c \ + state_tracker/st_atom_rasterizer.c \ + state_tracker/st_atom_sampler.c \ + state_tracker/st_atom_scissor.c \ + state_tracker/st_atom_shader.c \ + state_tracker/st_atom_shader.h \ + state_tracker/st_atom_stipple.c \ + state_tracker/st_atom_texture.c \ + state_tracker/st_atom_viewport.c \ + state_tracker/st_cache.h \ + state_tracker/st_cb_bitmap.c \ + state_tracker/st_cb_bitmap.h \ + state_tracker/st_cb_blit.c \ + state_tracker/st_cb_blit.h \ + state_tracker/st_cb_bufferobjects.c \ + state_tracker/st_cb_bufferobjects.h \ + state_tracker/st_cb_clear.c \ + state_tracker/st_cb_clear.h \ + state_tracker/st_cb_condrender.c \ + state_tracker/st_cb_condrender.h \ + state_tracker/st_cb_drawpixels.c \ + state_tracker/st_cb_drawpixels.h \ + state_tracker/st_cb_drawtex.c \ + state_tracker/st_cb_drawtex.h \ + state_tracker/st_cb_eglimage.c \ + state_tracker/st_cb_eglimage.h \ + state_tracker/st_cb_fbo.c \ + state_tracker/st_cb_fbo.h \ + state_tracker/st_cb_feedback.c \ + state_tracker/st_cb_feedback.h \ + state_tracker/st_cb_flush.c \ + state_tracker/st_cb_flush.h \ + state_tracker/st_cb_msaa.c \ + state_tracker/st_cb_msaa.h \ + state_tracker/st_cb_program.c \ + state_tracker/st_cb_program.h \ + state_tracker/st_cb_queryobj.c \ + state_tracker/st_cb_queryobj.h \ + state_tracker/st_cb_rasterpos.c \ + state_tracker/st_cb_rasterpos.h \ + state_tracker/st_cb_readpixels.c \ + state_tracker/st_cb_readpixels.h \ + state_tracker/st_cb_strings.c \ + state_tracker/st_cb_strings.h \ + state_tracker/st_cb_syncobj.c \ + state_tracker/st_cb_syncobj.h \ + state_tracker/st_cb_texturebarrier.c \ + state_tracker/st_cb_texturebarrier.h \ + state_tracker/st_cb_texture.c \ + state_tracker/st_cb_texture.h \ + state_tracker/st_cb_viewport.c \ + state_tracker/st_cb_viewport.h \ + state_tracker/st_cb_xformfb.c \ + state_tracker/st_cb_xformfb.h \ + state_tracker/st_context.c \ + state_tracker/st_context.h \ + state_tracker/st_debug.c \ + state_tracker/st_debug.h \ + state_tracker/st_draw.c \ + state_tracker/st_draw_feedback.c \ + state_tracker/st_draw.h \ + state_tracker/st_extensions.c \ + state_tracker/st_extensions.h \ + state_tracker/st_format.c \ + state_tracker/st_format.h \ + state_tracker/st_gen_mipmap.c \ + state_tracker/st_gen_mipmap.h \ + state_tracker/st_gl_api.h \ + state_tracker/st_glsl_to_tgsi.cpp \ + state_tracker/st_glsl_to_tgsi.h \ + state_tracker/st_manager.c \ + state_tracker/st_manager.h \ + state_tracker/st_mesa_to_tgsi.c \ + state_tracker/st_mesa_to_tgsi.h \ + state_tracker/st_program.c \ + state_tracker/st_program.h \ + state_tracker/st_texture.c \ + state_tracker/st_texture.h \ + state_tracker/st_vdpau.c \ + state_tracker/st_vdpau.h PROGRAM_FILES = \ - $(SRCDIR)program/arbprogparse.c \ - $(SRCDIR)program/arbprogparse.h \ - $(SRCDIR)program/hash_table.h \ - $(SRCDIR)program/ir_to_mesa.cpp \ - $(SRCDIR)program/ir_to_mesa.h \ - $(BUILDDIR)program/lex.yy.c \ - $(SRCDIR)program/prog_cache.c \ - $(SRCDIR)program/prog_cache.h \ - $(SRCDIR)program/prog_execute.c \ - $(SRCDIR)program/prog_execute.h \ - $(SRCDIR)program/prog_hash_table.c \ - $(SRCDIR)program/prog_instruction.c \ - $(SRCDIR)program/prog_instruction.h \ - $(SRCDIR)program/prog_noise.c \ - $(SRCDIR)program/prog_noise.h \ - $(SRCDIR)program/prog_opt_constant_fold.c \ - $(SRCDIR)program/prog_optimize.c \ - $(SRCDIR)program/prog_optimize.h \ - $(SRCDIR)program/prog_parameter.c \ - $(SRCDIR)program/prog_parameter.h \ - $(SRCDIR)program/prog_parameter_layout.c \ - $(SRCDIR)program/prog_parameter_layout.h \ - $(SRCDIR)program/prog_print.c \ - $(SRCDIR)program/prog_print.h \ - $(SRCDIR)program/program.c \ - $(SRCDIR)program/program.h \ - $(SRCDIR)program/programopt.c \ - $(SRCDIR)program/programopt.h \ - $(SRCDIR)program/program_parse_extra.c \ - $(BUILDDIR)program/program_parse.tab.c \ - $(BUILDDIR)program/program_parse.tab.h \ - $(SRCDIR)program/program_parser.h \ - $(SRCDIR)program/prog_statevars.c \ - $(SRCDIR)program/prog_statevars.h \ - $(SRCDIR)program/sampler.cpp \ - $(SRCDIR)program/sampler.h \ - $(SRCDIR)program/string_to_uint_map.cpp \ - $(SRCDIR)program/symbol_table.c \ - $(SRCDIR)program/symbol_table.h + program/arbprogparse.c \ + program/arbprogparse.h \ + program/hash_table.h \ + program/ir_to_mesa.cpp \ + program/ir_to_mesa.h \ + program/lex.yy.c \ + program/prog_cache.c \ + program/prog_cache.h \ + program/prog_execute.c \ + program/prog_execute.h \ + program/prog_hash_table.c \ + program/prog_instruction.c \ + program/prog_instruction.h \ + program/prog_noise.c \ + program/prog_noise.h \ + program/prog_opt_constant_fold.c \ + program/prog_optimize.c \ + program/prog_optimize.h \ + program/prog_parameter.c \ + program/prog_parameter.h \ + program/prog_parameter_layout.c \ + program/prog_parameter_layout.h \ + program/prog_print.c \ + program/prog_print.h \ + program/program.c \ + program/program.h \ + program/programopt.c \ + program/programopt.h \ + program/program_parse_extra.c \ + program/program_parse.tab.c \ + program/program_parse.tab.h \ + program/program_parser.h \ + program/prog_statevars.c \ + program/prog_statevars.h \ + program/sampler.cpp \ + program/sampler.h \ + program/string_to_uint_map.cpp \ + program/symbol_table.c \ + program/symbol_table.h ASM_C_FILES = \ - $(SRCDIR)x86/common_x86.c \ - $(SRCDIR)x86/x86_xform.c \ - $(SRCDIR)x86/3dnow.c \ - $(SRCDIR)x86/sse.c \ - $(SRCDIR)x86/rtasm/x86sse.c \ - $(SRCDIR)x86/rtasm/x86sse.h \ - $(SRCDIR)sparc/sparc.c \ - $(SRCDIR)x86-64/x86-64.c + x86/common_x86.c \ + x86/x86_xform.c \ + x86/3dnow.c \ + x86/sse.c \ + x86/rtasm/x86sse.c \ + x86/rtasm/x86sse.h \ + sparc/sparc.c \ + x86-64/x86-64.c X86_FILES = \ - $(SRCDIR)x86/assyntax.h \ - $(SRCDIR)x86/clip_args.h \ - $(SRCDIR)x86/norm_args.h \ - $(SRCDIR)x86/xform_args.h \ - $(SRCDIR)x86/common_x86_asm.S \ - $(SRCDIR)x86/common_x86_asm.h \ - $(SRCDIR)x86/common_x86_features.h \ - $(SRCDIR)x86/x86_xform.h \ - $(SRCDIR)x86/x86_xform2.S \ - $(SRCDIR)x86/x86_xform3.S \ - $(SRCDIR)x86/x86_xform4.S \ - $(SRCDIR)x86/x86_cliptest.S \ - $(SRCDIR)x86/mmx.h \ - $(SRCDIR)x86/mmx_blend.S \ - $(SRCDIR)x86/mmx_blendtmp.h \ - $(SRCDIR)x86/3dnow.h \ - $(SRCDIR)x86/3dnow_xform1.S \ - $(SRCDIR)x86/3dnow_xform2.S \ - $(SRCDIR)x86/3dnow_xform3.S \ - $(SRCDIR)x86/3dnow_xform4.S \ - $(SRCDIR)x86/sse.h \ - $(SRCDIR)x86/sse_xform1.S \ - $(SRCDIR)x86/sse_xform2.S \ - $(SRCDIR)x86/sse_xform3.S \ - $(SRCDIR)x86/sse_xform4.S \ - $(SRCDIR)x86/sse_normal.S \ - $(SRCDIR)x86/read_rgba_span_x86.S + x86/assyntax.h \ + x86/clip_args.h \ + x86/norm_args.h \ + x86/xform_args.h \ + x86/common_x86_asm.S \ + x86/common_x86_asm.h \ + x86/common_x86_features.h \ + x86/x86_xform.h \ + x86/x86_xform2.S \ + x86/x86_xform3.S \ + x86/x86_xform4.S \ + x86/x86_cliptest.S \ + x86/mmx.h \ + x86/mmx_blend.S \ + x86/mmx_blendtmp.h \ + x86/3dnow.h \ + x86/3dnow_xform1.S \ + x86/3dnow_xform2.S \ + x86/3dnow_xform3.S \ + x86/3dnow_xform4.S \ + x86/sse.h \ + x86/sse_xform1.S \ + x86/sse_xform2.S \ + x86/sse_xform3.S \ + x86/sse_xform4.S \ + x86/sse_normal.S \ + x86/read_rgba_span_x86.S X86_64_FILES = \ - $(SRCDIR)x86-64/x86-64.h \ - $(SRCDIR)x86-64/xform4.S + x86-64/x86-64.h \ + x86-64/xform4.S SPARC_FILES = \ - $(SRCDIR)sparc/sparc.h \ - $(SRCDIR)sparc/sparc_clip.S \ - $(SRCDIR)sparc/sparc_matrix.h \ - $(SRCDIR)sparc/norm.S \ - $(SRCDIR)sparc/xform.S + sparc/sparc.h \ + sparc/sparc_clip.S \ + sparc/sparc_matrix.h \ + sparc/norm.S \ + sparc/xform.S COMMON_DRIVER_FILES = \ - $(SRCDIR)drivers/common/driverfuncs.c \ - $(SRCDIR)drivers/common/driverfuncs.h \ - $(SRCDIR)drivers/common/meta_blit.c \ - $(SRCDIR)drivers/common/meta_copy_image.c \ - $(SRCDIR)drivers/common/meta_generate_mipmap.c \ - $(SRCDIR)drivers/common/meta_tex_subimage.c \ - $(SRCDIR)drivers/common/meta.c \ - $(SRCDIR)drivers/common/meta.h + drivers/common/driverfuncs.c \ + drivers/common/driverfuncs.h \ + drivers/common/meta_blit.c \ + drivers/common/meta_copy_image.c \ + drivers/common/meta_generate_mipmap.c \ + drivers/common/meta_tex_subimage.c \ + drivers/common/meta.c \ + drivers/common/meta.h # Sources for building non-Gallium drivers @@ -605,7 +599,7 @@ MESA_GALLIUM_FILES = \ $(MATH_FILES) \ $(VBO_FILES) \ $(STATETRACKER_FILES) \ - $(SRCDIR)x86/common_x86.c + x86/common_x86.c ### Include directories diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index 19c4be0feba..a237b65bc08 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -39,8 +39,6 @@ endef # Import the following variables: # PROGRAM_FILES include $(MESA_TOP)/src/mesa/Makefile.sources -SRCDIR := -BUILDDIR := include $(CLEAR_VARS) |