From bfd2bd2b3a24723b3a9f5fc7d590ea639a92482a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 28 Jan 2000 22:18:03 +0000 Subject: [PATCH] added -I. to .S.o rule --- src/mesa/Makefile.X11 | 7 +++---- src/mesa/main/Makefile.X11 | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index d156a4c41b3..8ea152369cb 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.14 2000/01/23 17:48:16 brianp Exp $ +# $Id: Makefile.X11,v 1.15 2000/01/28 22:18:03 brianp Exp $ # Mesa 3-D graphics library # Version: 3.3 @@ -125,8 +125,7 @@ DRIVER_SOURCES = \ FX/fxtexman.c \ FX/fxtrifuncs.c \ FX/fxvsetup.c \ - FX/fxglidew.c -# GGI/ggimesa.c + FX/fxglidew.c ASM_SOURCES = @@ -144,7 +143,7 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ .S.o: - $(CC) -c $(CFLAGS) $< -o $@ + $(CC) -c -I. $(CFLAGS) $< -o $@ # UGH! These rules shouldn't be needed but IRIX's make (and others?) needs them diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index d156a4c41b3..8ea152369cb 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.14 2000/01/23 17:48:16 brianp Exp $ +# $Id: Makefile.X11,v 1.15 2000/01/28 22:18:03 brianp Exp $ # Mesa 3-D graphics library # Version: 3.3 @@ -125,8 +125,7 @@ DRIVER_SOURCES = \ FX/fxtexman.c \ FX/fxtrifuncs.c \ FX/fxvsetup.c \ - FX/fxglidew.c -# GGI/ggimesa.c + FX/fxglidew.c ASM_SOURCES = @@ -144,7 +143,7 @@ OBJECTS = $(ASM_SOURCES:.S=.o) \ $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ .S.o: - $(CC) -c $(CFLAGS) $< -o $@ + $(CC) -c -I. $(CFLAGS) $< -o $@ # UGH! These rules shouldn't be needed but IRIX's make (and others?) needs them -- 2.30.2