Mesa (master): mesa: remove PROGRAM_DIRS from config files
Brian Paul
brianp at kemper.freedesktop.org
Fri Jun 4 23:48:09 UTC 2010
Module: Mesa
Branch: master
Commit: 3d07060ae338b2906f3fd7a4f89ec51f70852f69
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d07060ae338b2906f3fd7a4f89ec51f70852f69
Author: Brian Paul <brianp at vmware.com>
Date: Fri Jun 4 17:42:04 2010 -0600
mesa: remove PROGRAM_DIRS from config files
---
configs/autoconf.in | 3 ---
configs/beos | 1 -
configs/bluegene-osmesa | 1 -
configs/bluegene-xlc-osmesa | 1 -
configs/catamount-osmesa-pgi | 1 -
configs/darwin | 1 -
configs/default | 2 --
configs/freebsd-dri | 1 -
configs/linux-dri | 1 -
configs/linux-dri-xcb | 1 -
configs/linux-egl | 1 -
configs/linux-fbdev | 1 -
configs/linux-indirect | 1 -
configs/linux-opengl-es | 1 -
configs/linux-osmesa | 1 -
configs/linux-osmesa-static | 1 -
configs/linux-osmesa16 | 1 -
configs/linux-osmesa16-static | 1 -
configs/linux-osmesa32 | 1 -
19 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/configs/autoconf.in b/configs/autoconf.in
index b7e8d8e..3428e3a 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -95,9 +95,6 @@ GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = @PROGRAM_DIRS@
-
# Driver specific build vars
DRI_DIRS = @DRI_DIRS@
EGL_DISPLAYS = @EGL_DISPLAYS@
diff --git a/configs/beos b/configs/beos
index 69a8fd4..6a2d5ef 100644
--- a/configs/beos
+++ b/configs/beos
@@ -93,7 +93,6 @@ endif
SRC_DIRS = gallium mesa glu glut/beos glew
GLU_DIRS = sgi
DRIVER_DIRS = beos
-PROGRAM_DIRS = beos samples redbook demos tests
# Library/program dependencies
GL_LIB_DEPS =
diff --git a/configs/bluegene-osmesa b/configs/bluegene-osmesa
index d22454f..8851110 100644
--- a/configs/bluegene-osmesa
+++ b/configs/bluegene-osmesa
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
index b0c762d..292199a 100644
--- a/configs/bluegene-xlc-osmesa
+++ b/configs/bluegene-xlc-osmesa
@@ -20,7 +20,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/configs/catamount-osmesa-pgi b/configs/catamount-osmesa-pgi
index 835f6eb..74fd53a 100644
--- a/configs/catamount-osmesa-pgi
+++ b/configs/catamount-osmesa-pgi
@@ -23,7 +23,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/configs/darwin b/configs/darwin
index 0af77c7..147679f 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -57,4 +57,3 @@ GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri
DRI_DIRS = swrast
-PROGRAM_DIRS = xdemos
diff --git a/configs/default b/configs/default
index f0395ce..9f50c75 100644
--- a/configs/default
+++ b/configs/default
@@ -99,8 +99,6 @@ SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
gallium egl gallium/winsys gallium/targets glu glut/glx glew glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples glsl objviewer xdemos
# EGL drivers to build
EGL_DRIVERS_DIRS = glx
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 2c697e1..a80a7ce 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -43,7 +43,6 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
# Directories
SRC_DIRS = glx gallium mesa glu glut/glx glew glw
DRIVER_DIRS = dri
-PROGRAM_DIRS =
DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/configs/linux-dri b/configs/linux-dri
index 49e3579..de90f38 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,7 +52,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
# Directories
SRC_DIRS := glx egl $(SRC_DIRS)
-PROGRAM_DIRS := egl/eglut egl/opengl $(PROGRAM_DIRS)
# EGL directories
EGL_DRIVERS_DIRS = glx
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 1ed980a..cf78ac4 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -48,7 +48,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
SRC_DIRS = glx gallium mesa glu glut/glx glew glw
-PROGRAM_DIRS = xdemos
DRIVER_DIRS = dri
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
diff --git a/configs/linux-egl b/configs/linux-egl
index 566c7b9..6393e94 100644
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -48,7 +48,6 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
# Directories
SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
-PROGRAM_DIRS = egl/eglut egl/opengl
DRIVER_DIRS = dri
GALLIUM_WINSYS_DIRS = egl_drm
diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index 7d3bdc1..4fc6384 100644
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -11,7 +11,6 @@ CFLAGS += -fno-strict-aliasing
SRC_DIRS += glut/fbdev
DRIVER_DIRS = fbdev osmesa
-PROGRAM_DIRS = fbdev demos redbook samples
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
OSMESA_LIB_DEPS = -lm -lpthread
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 1c7dd85..2d19a5e 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -49,4 +49,3 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
# Directories
SRC_DIRS = glx glu glut/glx glew glw
DRIVER_DIRS =
-PROGRAM_DIRS =
diff --git a/configs/linux-opengl-es b/configs/linux-opengl-es
index fb65c02..93c0d47 100644
--- a/configs/linux-opengl-es
+++ b/configs/linux-opengl-es
@@ -8,7 +8,6 @@ CONFIG_NAME = linux-opengl-es
LIB_DIR = lib
SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \
gallium gallium/winsys gallium/targets
-PROGRAM_DIRS = egl/eglut egl/opengles1 egl/opengles2
# egl st needs this
DEFINES += -DGLX_DIRECT_RENDERING
diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index c183171..4cc5e51 100644
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -19,7 +19,6 @@ CXXFLAGS += -fno-strict-aliasing
# Directories
SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
index a03e63e..7220794 100644
--- a/configs/linux-osmesa-static
+++ b/configs/linux-osmesa-static
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
index 161bd57..e6c26a2 100644
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -22,7 +22,6 @@ OSMESA_LIB_NAME = libOSMesa16.so
# Directories
SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
index 146aeb8..a6c0cab 100644
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa16.a
# Directories
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
index ff1b189..dafa31b 100644
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -22,7 +22,6 @@ OSMESA_LIB_NAME = libOSMesa32.so
# Directories
SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
More information about the mesa-commit
mailing list