From: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon, 29 Oct 2007 18:21:37 +0000 (-0700)
Subject: Build xdemos programs by default on linux-dri
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06ca14543ee3dc4ed35a98db71b0d4a7aa7d9371;p=mesa.git

Build xdemos programs by default on linux-dri

Since libglut is no longer hardcoded, we can build the xdemos programs
so long as a GLX enabled libGL and libGLU have been built.
---

diff --git a/configs/linux-dri b/configs/linux-dri
index afa2d8ca346..2369f75b07d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -55,10 +55,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS =
+PROGRAM_DIRS = xdemos
 endif
 
 DRIVER_DIRS = dri
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 3db5293ea49..1f233f07f58 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -55,10 +55,10 @@ USING_EGL=0
 # Directories
 ifeq ($(USING_EGL), 1)
 SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl xdemos
 else
 SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS =
+PROGRAM_DIRS = xdemos
 endif
 
 DRIVER_DIRS = dri