aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-11-23 20:44:12 +0000
committerBrian Paul <[email protected]>2001-11-23 20:44:12 +0000
commit358ed73e1db4826fca3c33f78553ffd9322df109 (patch)
tree16367f12bdee68051247b07dd4039c94e28e1208
parent3183af39d043fe24156385d01244cfb2b8397cc9 (diff)
fix for bug 474479, remove Trace/* stuff
-rw-r--r--src/mesa/Makefile.X1116
-rw-r--r--src/mesa/main/Makefile.X1116
2 files changed, 12 insertions, 20 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 6d13089aa18..dc7b2c99f25 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
+# $Id: Makefile.X11,v 1.59 2001/11/23 20:44:12 brianp Exp $
# Mesa 3-D graphics library
-# Version: 4.0
+# Version: 4.1
# Copyright (C) 1995-2001 Brian Paul
# Makefile for core library
@@ -167,13 +167,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 =
@@ -279,7 +273,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
+# 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
GGI/ggimesa.o: GGI/ggimesa.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 6d13089aa18..dc7b2c99f25 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
+# $Id: Makefile.X11,v 1.59 2001/11/23 20:44:12 brianp Exp $
# Mesa 3-D graphics library
-# Version: 4.0
+# Version: 4.1
# Copyright (C) 1995-2001 Brian Paul
# Makefile for core library
@@ -167,13 +167,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 =
@@ -279,7 +273,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
+# 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
GGI/ggimesa.o: GGI/ggimesa.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@