i965: don't emit state when dri_bufmgr_check_aperture_space fails.

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 3827ffb3f72403fa7c67152460a87e581534037d..ba65ce695fbf39f853463b556260cbe60b1ecede 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -30,11 +30,11 @@ default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
 
 # Make archive of core mesa object files
 libmesa.a: $(MESA_OBJECTS)
-       @ $(TOP)/bin/mklib -o mesa -static $(MESA_OBJECTS)
+       @ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
 
 # Make archive of gl* API dispatcher functions only
 libglapi.a: $(GLAPI_OBJECTS)
-       @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
+       @ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
 
 
 ######################################################################
@@ -105,13 +105,13 @@ install-headers:
 install-libgl: default gl.pc install-headers
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)* \
+       $(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
                $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 install-osmesa: default
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)* \
+       $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
                $(DESTDIR)$(INSTALL_LIB_DIR)
 
 install-dri: default
@@ -129,6 +129,7 @@ clean:
        -rm -f */*/*.o
        -rm -f depend depend.bak libmesa.a libglapi.a
        -rm -f drivers/*/*.o
+       -rm -f *.pc
        -@cd drivers/dri && $(MAKE) clean
        -@cd drivers/x11 && $(MAKE) clean
        -@cd drivers/osmesa && $(MAKE) clean