Clean up for non X86.

1 files changed, 22 insertions, 47 deletions

diff --git a/xc/lib/GL/mesa/tnl/Imakefile.inc b/xc/lib/GL/mesa/tnl/Imakefile.inc
index 96d01f109..e720854b3 100644
--- a/xc/lib/GL/mesa/tnl/Imakefile.inc
+++ b/xc/lib/GL/mesa/tnl/Imakefile.inc
@@ -6,11 +6,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $
 
 MESATNLBUILDDIR = MesaTnlBuildDir
 
-#if defined(i386Architecture) && MesaUseX86Asm
-#define MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \
-		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.S
-#endif
-
   MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \
 		  $(MESATNLBUILDDIR)t_array_import.c \
 		  $(MESATNLBUILDDIR)t_context.c \
@@ -31,9 +26,13 @@ MESATNLBUILDDIR = MesaTnlBuildDir
 		  $(MESATNLBUILDDIR)t_vtx_api.c \
 		  $(MESATNLBUILDDIR)t_vtx_eval.c \
 		  $(MESATNLBUILDDIR)t_vtx_exec.c \
-		  MesaTnlAsmSrcs \
 		  $(MESATNLBUILDDIR)t_vtx_generic.c
 
+#if defined(i386Architecture) && MesaUseX86Asm
+  MESA_TNL_SRCS += MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.S
+#endif
+
 #ifdef NeedToLinkMesaSrc
 LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl)
 LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/mesa/tnl)
@@ -73,33 +72,6 @@ LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
 #endif
 #endif
 
-#if defined(i386Architecture) && MesaUseX86Asm
-#define MesaTnlAsmObjs  $(MESATNLBUILDDIR)t_vtx_x86.o \
-		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
-
-  MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
-		  $(MESATNLBUILDDIR)t_array_import.o \
-		  $(MESATNLBUILDDIR)t_context.o \
-		  $(MESATNLBUILDDIR)t_pipeline.o \
-		  $(MESATNLBUILDDIR)t_save_api.o \
-		  $(MESATNLBUILDDIR)t_save_loopback.o \
-		  $(MESATNLBUILDDIR)t_save_playback.o \
-		  $(MESATNLBUILDDIR)t_vb_fog.o \
-		  $(MESATNLBUILDDIR)t_vb_light.o \
-		  $(MESATNLBUILDDIR)t_vb_normals.o \
-		  $(MESATNLBUILDDIR)t_vb_points.o \
-		  $(MESATNLBUILDDIR)t_vb_program.o \
-		  $(MESATNLBUILDDIR)t_vb_render.o \
-		  $(MESATNLBUILDDIR)t_vb_texgen.o \
-		  $(MESATNLBUILDDIR)t_vb_texmat.o \
-		  $(MESATNLBUILDDIR)t_vb_vertex.o \
-		  $(MESATNLBUILDDIR)t_vertex.o \
-		  $(MESATNLBUILDDIR)t_vtx_api.o \
-		  $(MESATNLBUILDDIR)t_vtx_eval.o \
-		  $(MESATNLBUILDDIR)t_vtx_exec.o \
-		  MesaTnlAsmObjs \
-		  $(MESATNLBUILDDIR)t_vtx_generic.o
-#else
   MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
                   $(MESATNLBUILDDIR)t_array_import.o \
                   $(MESATNLBUILDDIR)t_context.o \
@@ -121,14 +93,13 @@ LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
                   $(MESATNLBUILDDIR)t_vtx_eval.o \
                   $(MESATNLBUILDDIR)t_vtx_exec.o \
                   $(MESATNLBUILDDIR)t_vtx_generic.o
-#endif
 
-#if defined(DoSharedLib) && DoSharedLib
 #if defined(i386Architecture) && MesaUseX86Asm
-#define MesaTnlAsmUobjs $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \
-		  $(MESATNLBUILDDIR)unshared/t_vtx_x86_gcc.o
+  MESA_TNL_OBJS += $(MESATNLBUILDDIR)t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
 #endif
 
+#if defined(DoSharedLib) && DoSharedLib
  MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \
 		  $(MESATNLBUILDDIR)unshared/t_array_import.o \
 		  $(MESATNLBUILDDIR)unshared/t_context.o \
@@ -149,15 +120,15 @@ LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)unshared/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \
 		  $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \
-		  MesaTnlAsmUobjs \
 		  $(MESATNLBUILDDIR)unshared/t_vtx_generic.o
-#else
- MESA_TNL_UOBJS = $(MESA_TNL_OBJS)
-#endif
 
 #if defined(i386Architecture) && MesaUseX86Asm
-#define MesaTnlAsmDobjs $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \
-		  $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o
+ MESA_TNL_UOBJS += $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_x86_gcc.o
+#endif
+
+#else
+ MESA_TNL_UOBJS = $(MESA_TNL_OBJS)
 #endif
 
  MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \
@@ -180,12 +151,11 @@ LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)debugger/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \
 		  $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \
-		  MesaTnlAsmDobjs \
 		  $(MESATNLBUILDDIR)debugger/t_vtx_generic.o
 
 #if defined(i386Architecture) && MesaUseX86Asm
-#define MesaTnlAsmPobjs $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \
-		  $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o
+ MESA_TNL_DOBJS += $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o
 #endif
 
  MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \
@@ -208,5 +178,10 @@ LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
 		  $(MESATNLBUILDDIR)profiled/t_vtx_api.o \
 		  $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \
 		  $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \
-		  MesaTnlAsmPobjs \
 		  $(MESATNLBUILDDIR)profiled/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_POBJS += $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o
+#endif
+