X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FMakefile.X11;h=7a7d18a23664318b3ceb5582895d5b201a90df3f;hb=8753bd89002c31f4cc747cceafbb12368424b8f3;hp=beee04ae76e269290dc86f2128582009700f31e1;hpb=0a59ca6cae6ef24990f1c41c8c7857214489443c;p=mesa.git

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index beee04ae76e..7a7d18a2366 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.49 2001/03/28 20:44:43 gareth Exp $
+# $Id: Makefile.X11,v 1.51 2001/03/29 06:46:15 gareth Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -108,7 +108,7 @@ CORE_SOURCES = \
 	X86/x86.c \
 	X86/common_x86.c \
 	X86/3dnow.c \
-	X86/katmai.c \
+	X86/sse.c \
 	math/m_debug_norm.c \
 	math/m_debug_vertex.c \
 	math/m_debug_xform.c \
@@ -188,8 +188,7 @@ ASM_SOURCES =
 
 ADDITIONAL_OBJ =
 
-OBJECTS = $(GEN_SOURCES) \
-	$(ASM_SOURCES:.S=.o) \
+OBJECTS = $(ASM_SOURCES:.S=.o) \
 	$(CORE_SOURCES:.c=.o) \
 	$(DRIVER_SOURCES:.c=.o) \
 	$(ADDITIONAL_OBJ)
@@ -278,14 +277,17 @@ X86/x86.o: X86/x86.c
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X86/common_x86.o: X86/common_x86.c
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
+X86/common_x86_asm.o: X86/common_x86_asm.S X86/matypes.h
 X86/3dnow.o: X86/3dnow.c
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-X86/katmai.o: X86/katmai.c
+X86/sse.o: X86/sse.c
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
 X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c
 	$(CC) -I. -I$(INCDIR) $(CFLAGS) X86/gen_matypes.c -o X86/gen_matypes
 	./X86/gen_matypes > X86/matypes.h
-	rm -f X86/gen_matypes
+	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 $@