From d23b1b79777828848656e350a19ec3031205e9fc Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 20 Aug 2012 14:04:40 -0700 Subject: [PATCH] build: Remove GLU_DIRS --- configs/current.in | 1 - configs/default | 1 - configure.ac | 2 -- src/glu/Makefile | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/current.in b/configs/current.in index c4908421044..1802271f9ad 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 ea026e6320e..1f167b58e06 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 e9d4e793775..12ce8614541 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 b268265976f..472645ffb08 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 -- 2.30.2