Mesa (master): build: Remove GLU_DIRS
Matt Turner
mattst88 at kemper.freedesktop.org
Fri Aug 24 18:07:29 UTC 2012
Module: Mesa
Branch: master
Commit: d23b1b79777828848656e350a19ec3031205e9fc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d23b1b79777828848656e350a19ec3031205e9fc
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Aug 20 14:04:40 2012 -0700
build: Remove GLU_DIRS
---
configs/current.in | 1 -
configs/default | 1 -
configure.ac | 2 --
src/glu/Makefile | 2 +-
4 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/configs/current.in b/configs/current.in
index c490842..1802271 100644
--- a/configs/current.in
+++ b/configs/current.in
@@ -105,7 +105,6 @@ GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@
# Directories to build
LIB_DIR = @LIB_DIR@
SRC_DIRS = @SRC_DIRS@
-GLU_DIRS = @GLU_DIRS@
DRIVER_DIRS = @DRIVER_DIRS@
GALLIUM_DIRS = @GALLIUM_DIRS@
GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
diff --git a/configs/default b/configs/default
index ea026e6..1f167b5 100644
--- a/configs/default
+++ b/configs/default
@@ -95,7 +95,6 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
LIB_DIR = lib
SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
gallium egl gallium/winsys gallium/targets glu
-GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
# Gallium directories and
diff --git a/configure.ac b/configure.ac
index e9d4e79..12ce861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,7 +728,6 @@ dnl
dnl Driver specific build directories
dnl
SRC_DIRS="gtest"
-GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
GALLIUM_WINSYS_DIRS="sw"
@@ -784,7 +783,6 @@ if test "x$enable_osmesa" = xyes; then
fi
AC_SUBST([SRC_DIRS])
-AC_SUBST([GLU_DIRS])
AC_SUBST([DRIVER_DIRS])
AC_SUBST([GALLIUM_DIRS])
AC_SUBST([GALLIUM_TARGET_DIRS])
diff --git a/src/glu/Makefile b/src/glu/Makefile
index b268265..472645f 100644
--- a/src/glu/Makefile
+++ b/src/glu/Makefile
@@ -5,7 +5,7 @@ TOP = ../..
include $(TOP)/configs/current
-SUBDIRS = $(GLU_DIRS)
+SUBDIRS = sgi
default: $(TOP)/configs/current
More information about the mesa-commit
mailing list