Merge branch 'mesa_7_6_branch'

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 78b71d4676fadc19882c933a6b79529f9eab2cff..6f58ad61617de2f6afcf152f4375af28d53d195f 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -39,16 +39,12 @@ libmesagallium.a: $(MESA_GALLIUM_OBJECTS)
 
 # Make archive of gl* API dispatcher functions only
 libglapi.a: $(GLAPI_OBJECTS)
-       @if [ "${WINDOW_SYSTEM}" = "dri" ] ; then \
-               touch libglapi.a ; \
-       else \
-               $(MKLIB) -o glapi -static $(GLAPI_OBJECTS) ; \
-       fi
+       $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
 
 ######################################################################
 # Device drivers
 driver_subdirs: libmesa.a libglapi.a
-       (cd drivers && $(MAKE))
+       @ (cd drivers && $(MAKE))
 
 
 ######################################################################
@@ -103,7 +99,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) $< > $@
@@ -128,14 +125,14 @@ 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_GLOB) \
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
                $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
 
 install-osmesa: default osmesa.pc
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-       $(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
                $(DESTDIR)$(INSTALL_LIB_DIR)
        $(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig