Fix FreeBSD build by building libGL in the order desired, and doing a fix to my

mklib changes.

diff --git a/bin/mklib b/bin/mklib
index ce405d1c8962c8eab11c588608fbccd49a8143be..5b04234785ccbc63dc4617c1db99058a7115e600 100755 (executable)
--- a/bin/mklib
+++ b/bin/mklib
@@ -338,7 +338,8 @@ case $ARCH in
            echo "mklib: Making FreeBSD shared library: " ${SHLIB}
            rm -f ${SHLIB}
            ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
-           FINAL_LIBS=${SHLIB}
+           ln -sf ${SHLIB} "lib${LIBNAME}.so"
+           FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
        fi
        ;;
 

diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index c7d3659e9143a9021e9361124c442ec314cc8e5e..e8b3a96bf90afeff0188dc599557b1020fe8be1a 100644 (file)
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -31,7 +31,7 @@ GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
 
 
 # Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri