glu/sgi: Initialize member of class primStream.

[mesa.git] / src / glu / sgi / Makefile

diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index 3ca696ff258cb7e7a45320f541c7f463345deadc..20c3bed0c9354ff4f9505c2f99f9f0b429f27e19 100644 (file)
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -125,20 +125,21 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
 
 default:
        @if [ "${CONFIG_NAME}" = "beos" ] ; then \
-               echo "GLU library not build under BeOS: integrated into ${LIB_DIR}/${GL_LIB_NAME} library." ; \
+               echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into ${GL_LIB_NAME}." ; \
                exit 0 ; \
        else \
-               $(MAKE) "${LIB_DIR}/${GLU_LIB_NAME}" ; \
+               $(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \
        fi
 
-$(LIB_DIR):
-       -mkdir $(LIB_DIR)
+$(TOP)/$(LIB_DIR):
+       -mkdir $(TOP)/$(LIB_DIR)
 
 # Make the library:
-$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-               -minor $(GLU_MINOR) -patch $(GLU_TINY) \
-               -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+       $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+               -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+               -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
+               -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
                $(GLU_LIB_DEPS) $(OBJECTS)