KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make generation of matypes.h more transparent.

This commit is contained in:
Gareth Hughes 2001-03-29 03:41:39 +00:00
parent c41edfb7c4
commit 8e48a232fe
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Make-config
View File

@ -1,4 +1,4 @@
# $Id: Make-config,v 1.39 2001/03/29 03:14:48 gareth Exp $ # $Id: Make-config,v 1.40 2001/03/29 03:41:39 gareth Exp $
MESA_MAJOR=3 MESA_MAJOR=3
MESA_MINOR=5 MESA_MINOR=5
@ -219,7 +219,6 @@ freebsd-386:
"CCFLAGS = $(CFLAGS)" \ "CCFLAGS = $(CFLAGS)" \
"MAKELIB = ../bin/mklib.freebsd" \ "MAKELIB = ../bin/mklib.freebsd" \
"APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -556,13 +555,13 @@ linux-x86:
"GLW_LIB = libGLw.so" \ "GLW_LIB = libGLw.so" \
"OSMESA_LIB = libOSMesa.so" \ "OSMESA_LIB = libOSMesa.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
"CPLUSPLUS = g++" \
"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \ "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.linux" \ "MAKELIB = ../bin/mklib.linux" \
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -586,13 +585,13 @@ linux-x86-static:
"GLW_LIB = libGLw.a" \ "GLW_LIB = libGLw.a" \
"OSMESA_LIB = libOSMesa.a" \ "OSMESA_LIB = libOSMesa.a" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
"CPLUSPLUS = g++" \
"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \ "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
"MAKELIB = ../bin/mklib.ar-ruv" \ "MAKELIB = ../bin/mklib.ar-ruv" \
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -637,7 +636,6 @@ linux-386-ggi:
"CCFLAGS = $(CFLAGS)" \ "CCFLAGS = $(CFLAGS)" \
"MAKELIB = ../bin/mklib.ggi" \ "MAKELIB = ../bin/mklib.ggi" \
"APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \ "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked3.S \ X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
X86/x86_xform_raw3.S X86/x86_xform_masked2.S \ X86/x86_xform_raw3.S X86/x86_xform_masked2.S \
@ -677,7 +675,6 @@ linux-386-glide:
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -700,7 +697,6 @@ linux-386-opt-glide:
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -723,7 +719,6 @@ linux-386-opt-V2-glide:
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -738,13 +733,13 @@ linux-x86-glide:
"GLW_LIB = libGLw.so" \ "GLW_LIB = libGLw.so" \
"OSMESA_LIB = libOSMesa.so" \ "OSMESA_LIB = libOSMesa.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
"CPLUSPLUS = g++" \
"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \ "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
"MAKELIB = ../bin/mklib.linux" \ "MAKELIB = ../bin/mklib.linux" \
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -1003,7 +998,6 @@ os2-x11:
"CCFLAGS = $(CFLAGS)" \ "CCFLAGS = $(CFLAGS)" \
"MAKELIB = ..\\bin\\mklib-emx.cmd " \ "MAKELIB = ..\\bin\\mklib-emx.cmd " \
"APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \ "APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -1508,13 +1502,13 @@ linux-x86-debug:
"GLW_LIB = libGLw.so" \ "GLW_LIB = libGLw.so" \
"OSMESA_LIB = libOSMesa.so" \ "OSMESA_LIB = libOSMesa.so" \
"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
"CPLUSPLUS = g++" \
"CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \ "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
"MAKELIB = ../bin/mklib.linux" \ "MAKELIB = ../bin/mklib.linux" \
"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
"GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \
"GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
"APP_LIB_DEPS = -lm" \ "APP_LIB_DEPS = -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \
@ -1558,7 +1552,6 @@ linux-prof:
"CCFLAGS = $(CFLAGS)" \ "CCFLAGS = $(CFLAGS)" \
"MAKELIB = ../bin/mklib.ar-ruv" \ "MAKELIB = ../bin/mklib.ar-ruv" \
"APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw2.S X86/x86_xform_masked3.S \ X86/x86_xform_raw2.S X86/x86_xform_masked3.S \
@ -1588,7 +1581,6 @@ linux-glide-prof:
"CCFLAGS = $(CFLAGS)" \ "CCFLAGS = $(CFLAGS)" \
"MAKELIB = ../bin/mklib.ar-ruv" \ "MAKELIB = ../bin/mklib.ar-ruv" \
"APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
"GEN_SOURCES = X86/matypes.h" \
"ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \
X86/x86_xform_raw2.S X86/x86_xform_masked2.S \ X86/x86_xform_raw2.S X86/x86_xform_masked2.S \
X86/x86_xform_raw3.S X86/x86_xform_masked3.S \ X86/x86_xform_raw3.S X86/x86_xform_masked3.S \

10
src/mesa/Makefile.X11
View File

@ -1,4 +1,4 @@
# $Id: Makefile.X11,v 1.49 2001/03/28 20:44:43 gareth Exp $ # $Id: Makefile.X11,v 1.50 2001/03/29 03:41:40 gareth Exp $
# Mesa 3-D graphics library # Mesa 3-D graphics library
# Version: 3.5 # Version: 3.5
@ -188,8 +188,7 @@ ASM_SOURCES =
ADDITIONAL_OBJ = ADDITIONAL_OBJ =
OBJECTS = $(GEN_SOURCES) \ OBJECTS = $(ASM_SOURCES:.S=.o) \
$(ASM_SOURCES:.S=.o) \
$(CORE_SOURCES:.c=.o) \ $(CORE_SOURCES:.c=.o) \
$(DRIVER_SOURCES:.c=.o) \ $(DRIVER_SOURCES:.c=.o) \
$(ADDITIONAL_OBJ) $(ADDITIONAL_OBJ)
@ -278,6 +277,7 @@ X86/x86.o: X86/x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/common_x86.o: X86/common_x86.c X86/common_x86.o: X86/common_x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(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 X86/3dnow.o: X86/3dnow.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/katmai.o: X86/katmai.c X86/katmai.o: X86/katmai.c
@ -285,7 +285,9 @@ X86/katmai.o: X86/katmai.c
X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c 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 $(CC) -I. -I$(INCDIR) $(CFLAGS) X86/gen_matypes.c -o X86/gen_matypes
./X86/gen_matypes > X86/matypes.h ./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 GGI/ggimesa.o: GGI/ggimesa.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@

10
src/mesa/main/Makefile.X11
View File

@ -1,4 +1,4 @@
# $Id: Makefile.X11,v 1.49 2001/03/28 20:44:43 gareth Exp $ # $Id: Makefile.X11,v 1.50 2001/03/29 03:41:40 gareth Exp $
# Mesa 3-D graphics library # Mesa 3-D graphics library
# Version: 3.5 # Version: 3.5
@ -188,8 +188,7 @@ ASM_SOURCES =
ADDITIONAL_OBJ = ADDITIONAL_OBJ =
OBJECTS = $(GEN_SOURCES) \ OBJECTS = $(ASM_SOURCES:.S=.o) \
$(ASM_SOURCES:.S=.o) \
$(CORE_SOURCES:.c=.o) \ $(CORE_SOURCES:.c=.o) \
$(DRIVER_SOURCES:.c=.o) \ $(DRIVER_SOURCES:.c=.o) \
$(ADDITIONAL_OBJ) $(ADDITIONAL_OBJ)
@ -278,6 +277,7 @@ X86/x86.o: X86/x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/common_x86.o: X86/common_x86.c X86/common_x86.o: X86/common_x86.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(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 X86/3dnow.o: X86/3dnow.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
X86/katmai.o: X86/katmai.c X86/katmai.o: X86/katmai.c
@ -285,7 +285,9 @@ X86/katmai.o: X86/katmai.c
X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c 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 $(CC) -I. -I$(INCDIR) $(CFLAGS) X86/gen_matypes.c -o X86/gen_matypes
./X86/gen_matypes > X86/matypes.h ./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 GGI/ggimesa.o: GGI/ggimesa.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@

3
src/mesa/x86/gen_matypes.c
View File

@ -1,4 +1,4 @@
/* $Id: gen_matypes.c,v 1.1 2001/03/28 20:44:44 gareth Exp $ */ /* $Id: gen_matypes.c,v 1.2 2001/03/29 03:41:40 gareth Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -38,7 +38,6 @@
#include "all.h" #include "all.h"
#else #else
#include "glheader.h" #include "glheader.h"
#include "context.h"
#include "mtypes.h" #include "mtypes.h"
#include "tnl/t_context.h" #include "tnl/t_context.h"
#endif #endif