Merge branch 'master' into glsl2

[mesa.git] / configs / linux-sparc5

diff --git a/configs/linux-sparc5 b/configs/linux-sparc5
index 60e65ab309316d79bd4e4882fb86e67819a2a81d..e8848d26ab2384703717b56cdf79f4c912e1f971 100644 (file)
--- a/configs/linux-sparc5
+++ b/configs/linux-sparc5
@@ -1,19 +1,7 @@
 # Configuration for Linux on Sparc5
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-sparc
 
 CONFIG_NAME = linux-sparc5
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
-
+ARCH_FLAGS += -mcpu=ultrasparc