From 86edf54c40a6cc7cc537544250fe0758fb23d381 Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Mon, 2 Jan 2012 14:16:19 -0500
Subject: [PATCH] Build and ignore cleanups

GLSL renderer build was checking for BUILD_GL instead of BUILD_GLSL in a
few places. Also, ignore the GLSL .fc and .vc files and the binaries.
---
 .gitignore                           | 6 ++++++
 config.d/build_control.m4            | 2 +-
 libs/video/renderer/glsl/Makefile.am | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index cac91fb6e..4f8ff4c44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,6 +182,10 @@ core
 /libs/video/renderer/gl/fbset_modes_y.[ch]
 /libs/video/renderer/gl/fbset_modes_l.c
 
+# /libs/video/renderer/glsl/
+/libs/video/renderer/glsl/*.fc
+/libs/video/renderer/glsl/*.vc
+
 # /libs/video/renderer/sw/
 /libs/video/renderer/sw/fbset_modes_y.[ch]
 /libs/video/renderer/sw/fbset_modes_l.c
@@ -213,6 +217,7 @@ core
 /nq/source/fbset_modes_y.h
 /nq/source/nq-3dfx
 /nq/source/nq-fbdev
+/nq/source/nq-glslx
 /nq/source/nq-glx
 /nq/source/nq-sdl
 /nq/source/nq-sdl32
@@ -256,6 +261,7 @@ core
 /qw/source/qw-client-3dfx
 /qw/source/qw-client-fbdev
 /qw/source/qw-client-glx
+/qw/source/qw-client-glslx
 /qw/source/qw-client-sdl
 /qw/source/qw-client-sdl32
 /qw/source/qw-client-sgl
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 574c3f610..b10681e05 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -297,7 +297,7 @@ if test "x$BUILD_GL" = xyes; then
 	VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_gl.la"
 	VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_gl.la"
 fi
-if test "x$BUILD_GL" = xyes; then
+if test "x$BUILD_GLSL" = xyes; then
 	VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_glsl.la"
 	VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_glsl.la"
 fi
diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am
index 484b48321..ea7af4f57 100644
--- a/libs/video/renderer/glsl/Makefile.am
+++ b/libs/video/renderer/glsl/Makefile.am
@@ -14,7 +14,7 @@ glsl_src = \
 	glsl_alias.c glsl_draw.c glsl_main.c glsl_particles.c glsl_screen.c \
 	glsl_sprite.c glsl_textures.c
 
-if BUILD_GL
+if BUILD_GLSL
 noinst_LTLIBRARIES=	libglsl.la
 BUILT_SOURCES= $(shader_gen)
 else