Mesa (glsl-pp-rework-2): mesa: added new libglslpp.a and libglslcl. a to libGL build

[Brian Paul]

Module: Mesa
Branch: glsl-pp-rework-2
Commit: cc020425e929110613ddb405d3e82313d27a35ed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc020425e929110613ddb405d3e82313d27a35ed

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Dec 10 08:33:01 2009 -0700

mesa: added new libglslpp.a and libglslcl.a to libGL build

---

 src/mesa/Makefile    |    9 ++++-----
 src/mesa/sources.mak |    6 ++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 67cac2d..56e4059 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -18,7 +18,6 @@ include sources.mak
 
 
 
-
 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,
 # then convenience libs (.a) and finally the device drivers:
 default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
@@ -30,12 +29,12 @@ default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \
 # Helper libraries used by many drivers:
 
 # Make archive of core mesa object files
-libmesa.a: $(MESA_OBJECTS)
-	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
+libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
 
 # Make archive of subset of core mesa object files for gallium
-libmesagallium.a: $(MESA_GALLIUM_OBJECTS)
-	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS)
+libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
 
 # Make archive of gl* API dispatcher functions only
 libglapi.a: $(GLAPI_OBJECTS)
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 0c78733..ea20f99 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -364,6 +364,12 @@ GLAPI_OBJECTS = \
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 
+### Other archives/libraries
+
+GLSL_LIBS = \
+	$(TOP)/src/glsl/pp/libglslpp.a \
+	$(TOP)/src/glsl/cl/libglslcl.a
+
 
 ### Include directories