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

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 67cac2d24802f12b460f4b61e4578e9ae2948daa..56e40596c16f88a740aabc0dbdd2ffc478f529d5 100644 (file)
--- 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 0c78733ea78f819a75f14f2efcebb59c5972d047..ea20f99edee9b1d480d8090c389576fce81662e8 100644 (file)
--- 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