X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FMakefile.X11;h=940135f51141d55b7995da1ff0671d18a261139b;hb=e44bf40402f27171305df8506e6d53c7ba9c596b;hp=5f55bc6f8dc7dc5aab0f942d32dc9260c356bc05;hpb=2c2a956a3a88f5f5868b701f0157320169d19bd4;p=mesa.git diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 5f55bc6f8dc..940135f5114 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,8 +1,8 @@ -# $Id: Makefile.X11,v 1.53 2001/06/01 22:22:41 keithw Exp $ +# $Id: Makefile.X11,v 1.72 2002/10/29 23:09:40 brianp Exp $ # Mesa 3-D graphics library -# Version: 3.5 -# Copyright (C) 1995-2001 Brian Paul +# Version: 5.0 +# Copyright (C) 1995-2002 Brian Paul # Makefile for core library @@ -10,7 +10,7 @@ ##### MACROS ##### GL_MAJOR = 1 -GL_MINOR = 2 +GL_MINOR = 4 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) VPATH = RCS @@ -22,46 +22,17 @@ LIBDIR = ../lib CORE_SOURCES = \ api_arrayelt.c \ - tnl/t_array_api.c \ - tnl/t_array_import.c \ - tnl/t_context.c \ - tnl/t_eval_api.c \ - tnl/t_imm_alloc.c \ - tnl/t_imm_api.c \ - tnl/t_imm_debug.c \ - tnl/t_imm_dlist.c \ - tnl/t_imm_elt.c \ - tnl/t_imm_eval.c \ - tnl/t_imm_exec.c \ - tnl/t_imm_fixup.c \ - tnl/t_pipeline.c \ - tnl/t_vb_fog.c \ - tnl/t_vb_light.c \ - tnl/t_vb_normals.c \ - tnl/t_vb_points.c \ - tnl/t_vb_render.c \ - tnl/t_vb_texgen.c \ - tnl/t_vb_texmat.c \ - tnl/t_vb_vertex.c \ - swrast_setup/ss_context.c \ - swrast_setup/ss_triangle.c \ - swrast_setup/ss_vb.c \ - swrast_setup/ss_interp.c \ api_loopback.c \ api_noop.c \ api_validate.c \ accum.c \ - alpha.c \ attrib.c \ - bitmap.c \ blend.c \ buffers.c \ clip.c \ colortab.c \ - config.c \ context.c \ convolve.c \ - copypix.c \ debug.c \ depth.c \ dispatch.c \ @@ -83,20 +54,15 @@ CORE_SOURCES = \ imports.c \ light.c \ lines.c \ - logic.c \ - masking.c \ matrix.c \ - mem.c \ mmath.c \ pixel.c \ - pixeltex.c \ points.c \ polygon.c \ rastpos.c \ - readpix.c \ - scissor.c \ state.c \ stencil.c \ + texcompress.c \ texformat.c \ teximage.c \ texobj.c \ @@ -104,21 +70,21 @@ CORE_SOURCES = \ texstore.c \ texutil.c \ varray.c \ + vpexec.c \ + vpparse.c \ + vpstate.c \ vtxfmt.c \ - winpos.c \ X86/x86.c \ X86/common_x86.c \ X86/3dnow.c \ X86/sse.c \ math/m_debug_clip.c \ math/m_debug_norm.c \ - math/m_debug_vertex.c \ math/m_debug_xform.c \ math/m_eval.c \ math/m_matrix.c \ math/m_translate.c \ math/m_vector.c \ - math/m_vertices.c \ math/m_xform.c \ array_cache/ac_context.c \ array_cache/ac_import.c \ @@ -141,17 +107,40 @@ CORE_SOURCES = \ swrast/s_lines.c \ swrast/s_logic.c \ swrast/s_masking.c \ - swrast/s_pb.c \ swrast/s_pixeltex.c \ swrast/s_points.c \ swrast/s_readpix.c \ - swrast/s_scissor.c \ swrast/s_span.c \ swrast/s_stencil.c \ swrast/s_texture.c \ swrast/s_texstore.c \ swrast/s_triangle.c \ - swrast/s_zoom.c + swrast/s_zoom.c \ + swrast_setup/ss_context.c \ + swrast_setup/ss_triangle.c \ + swrast_setup/ss_vb.c \ + tnl/t_array_api.c \ + tnl/t_array_import.c \ + tnl/t_context.c \ + tnl/t_eval_api.c \ + tnl/t_imm_alloc.c \ + tnl/t_imm_api.c \ + tnl/t_imm_debug.c \ + tnl/t_imm_dlist.c \ + tnl/t_imm_elt.c \ + tnl/t_imm_eval.c \ + tnl/t_imm_exec.c \ + tnl/t_imm_fixup.c \ + tnl/t_pipeline.c \ + tnl/t_vb_fog.c \ + tnl/t_vb_light.c \ + tnl/t_vb_normals.c \ + tnl/t_vb_points.c \ + tnl/t_vb_program.c \ + tnl/t_vb_render.c \ + tnl/t_vb_texgen.c \ + tnl/t_vb_texmat.c \ + tnl/t_vb_vertex.c DRIVER_SOURCES = \ @@ -177,13 +166,7 @@ DRIVER_SOURCES = \ SVGA/svgamesa15.c \ SVGA/svgamesa16.c \ SVGA/svgamesa24.c \ - SVGA/svgamesa32.c \ - Trace/tr_context.c \ - Trace/tr_control.c \ - Trace/tr_error.c \ - Trace/tr_support.c \ - Trace/tr_wrapper.c \ - Trace/tr_write.c + SVGA/svgamesa32.c ASM_SOURCES = @@ -210,71 +193,6 @@ OSMESA_OBJECTS = OSmesa/osmesa.o $(CC) -c -I. $(CFLAGS) $< -o $@ -# UGH! These rules shouldn't be needed but IRIX's make (and others?) needs them -X/glxapi.o: X/glxapi.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/fakeglx.o: X/fakeglx.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xfonts.o: X/xfonts.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xm_api.o: X/xm_api.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xm_dd.o: X/xm_dd.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xm_span.o: X/xm_span.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xm_line.o: X/xm_line.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xm_tri.o: X/xm_tri.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - -SVGA/svgamesa.o: SVGA/svgamesa.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -SVGA/svgamesa8.o: SVGA/svgamesa8.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -SVGA/svgamesa15.o: SVGA/svgamesa15.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -SVGA/svgamesa16.o: SVGA/svgamesa16.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -SVGA/svgamesa24.o: SVGA/svgamesa24.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -SVGA/svgamesa32.o: SVGA/svgamesa32.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - -OSmesa/osmesa.o: OSmesa/osmesa.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - -FX/fxapi.o: FX/fxapi.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxclip.o: FX/fxclip.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxdd.o: FX/fxdd.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxddspan.o: FX/fxddspan.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxddtex.o: FX/fxddtex.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxfastpath.o: FX/fxfastpath.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxpipeline.o: FX/fxpipeline.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxrender.o: FX/fxrender.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxsanity.o: FX/fxsanity.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxsetup.o: FX/fxsetup.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxtrifuncs.o: FX/fxtrifuncs.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxtexman.o: FX/fxtexman.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxvsetup.o: FX/fxvsetup.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -FX/fxglidew.o: FX/fxglidew.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - -FX/X86/fx_3dnow_fastpath.o: FX/X86/fx_3dnow_fastpath.S - X86/x86.o: X86/x86.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X86/common_x86.o: X86/common_x86.c @@ -289,26 +207,9 @@ X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c ./X86/gen_matypes > X86/matypes.h rm -f X86/gen_matypes X86/*.o -$(ASM_SOURCES): X86/matypes.h - -GGI/ggimesa.o: GGI/ggimesa.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - -Trace/tr_2string.o: Trace/tr_2string.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_attrib.o: Trace/tr_attrib.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_context.o: Trace/tr_context.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_control.o: Trace/tr_control.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_error.o: Trace/tr_error.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_print.o: Trace/tr_print.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -Trace/tr_wrapper.o: Trace/tr_wrapper.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ - +# We have X86/matypes.h depend on X86/matypes.h so that if ASM_SOURCES +# is empty we don't get an invalid Makefile. +$(ASM_SOURCES) X86/matypes.h: X86/matypes.h ##### TARGETS ##### @@ -317,7 +218,7 @@ Trace/tr_wrapper.o: Trace/tr_wrapper.c # @echo "Specify a target configuration" clean: - -rm *.o *~ */*.o */*~ *.lo *.la + -rm -f *.o *~ */*.o */*~ *.lo *.la -rm -rf .libs targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(OSMESA_LIB)