summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--configs/default12
-rw-r--r--configs/linux-gallium22
-rw-r--r--configs/linux-gallium-debug8
4 files changed, 10 insertions, 34 deletions
diff --git a/Makefile b/Makefile
index 24cfbe5922..c79fb1cb28 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,6 @@ linux-dri-x86-64 \
linux-dri-ppc \
linux-dri-xcb \
linux-egl \
-linux-gallium \
-linux-gallium-debug \
linux-indirect \
linux-fbdev \
linux-glide \
diff --git a/configs/default b/configs/default
index ec8d51ccfe..13bda58f18 100644
--- a/configs/default
+++ b/configs/default
@@ -79,16 +79,24 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build
LIB_DIR = lib
-SRC_DIRS = mesa egl glu glut/glx glew glw
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
+DRIVER_DIRS =
# Which subdirs under $(TOP)/progs/ to enter:
PROGRAM_DIRS = demos redbook samples glsl xdemos
# EGL directories
EGL_DRIVERS_DIRS = demo
+# Gallium directories and
+GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+GALLIUM_WINSYS_DIRS = xlib egl_xlib
+
+# Library dependencies
#EXTRA_LIB_PATH ?=
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
diff --git a/configs/linux-gallium b/configs/linux-gallium
deleted file mode 100644
index b046f248ec..0000000000
--- a/configs/linux-gallium
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configuration for Linux / Gallium
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-gallium
-
-
-# Directories to build (adds gallium to SRC_DIRS)
-SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
-
-
-# don't build old/conventional Mesa drivers
-DRIVER_DIRS =
-
-
-# Gallium directories and
-GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
-GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
-GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = xlib egl_xlib
-
diff --git a/configs/linux-gallium-debug b/configs/linux-gallium-debug
deleted file mode 100644
index 111c43b884..0000000000
--- a/configs/linux-gallium-debug
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux / Gallium for debug
-
-include $(TOP)/configs/linux-gallium
-
-CONFIG_NAME = linux-gallium-debug
-
-OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH