glsl: signal that the program needs to be re-translated when samplers change

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 6b4057030ef00154dbe300885ae74ac8c48e2e83..bb18bee8eaf189f07d940f5cd4c0987ddf92e747 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -3,8 +3,7 @@
 TOP = ../..
 include $(TOP)/configs/current
 
-include sources
-
+include sources.mak
 
 .SUFFIXES : .cpp
 
@@ -19,9 +18,11 @@ include sources
 
 
 
+
 # Default: build dependencies, then asm_subdirs, then convenience
 # libs (.a) and finally the device drivers:
-default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
+default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \
+       driver_subdirs
 
 
 
@@ -32,15 +33,22 @@ default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
 libmesa.a: $(MESA_OBJECTS)
        @ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
 
+# Make archive of subset of core mesa object files for gallium
+libmesagallium.a: $(MESA_GALLIUM_OBJECTS)
+       @ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS)
+
 # Make archive of gl* API dispatcher functions only
 libglapi.a: $(GLAPI_OBJECTS)
-       @ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
-
+       @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
+               touch libglapi.a ; \
+       else \
+               $(MKLIB) -o glapi -static $(GLAPI_OBJECTS) ; \
+       fi
 
 ######################################################################
 # Device drivers
 driver_subdirs: libmesa.a libglapi.a
-       (cd drivers && $(MAKE))
+       @ (cd drivers && $(MAKE))
 
 
 ######################################################################
@@ -95,7 +103,8 @@ gl_pcedit = sed \
        -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
        -e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
        -e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
-       -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),'
+       -e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+       -e 's,@GL_LIB@,$(GL_LIB),'
 
 gl.pc: gl.pc.in
        $(gl_pcedit) $< > $@