Merge branch 'master' into gallium-0.2

[mesa.git] / src / glut / beos / Makefile

diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index a7ba512cb11c57d8e07de44519a0cbccb50cd791..a9f8684c9bd95eaa59a72b5aa5eb73c85434adbf 100644 (file)
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -83,9 +83,10 @@ $(TOP)/$(LIB_DIR):
 
 # Make the library
 $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-       @$(TOP)/bin/mklib -o $(GLUT_LIB) -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GLUT_LIB_DEPS) \
-               $(OBJECTS)
+       @$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(GLUT_LIB_DEPS) $(OBJECTS)
 
 clean:
        -rm -f *.o