Fix-ups for linux-fbdev config. No longer build Xlib driver sources.

diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index 3ab6b69c39ccb69743a9217d45ff6a84f9ac7b13..7a5d1b600f9803b03b5fa68c2172db41e54fe90d 100644 (file)
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -4,6 +4,10 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-fbdev
 
+DRIVER_DIRS = fbdev
+
+SRC_DIRS = mesa glu glut/fbdev
+
 CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
 
 

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 16cf6709ea5c4ec0f740e8c01346647d7b022c49..1d2f36f0fba47e07799693cd0623e063e7ee0a43 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -32,7 +32,9 @@ default:
        elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
                $(MAKE) beos ; \
        elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
-               $(MAKE) directfb; \
+               $(MAKE) directfb ; \
+       elif [ "$(DRIVER_DIRS)" = "fbdev" ]; then \
+               $(MAKE) fbdev ; \
        else \
                $(MAKE) stand-alone ; \
        fi
@@ -65,10 +67,21 @@ linux-solo: depend subdirs libmesa.a
 libgl-core: $(CORE_OBJECTS)
        @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
                -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) $(GL_LIB_DEPS)
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
+               $(GL_LIB_DEPS)
 
 directfb: depend subdirs libgl-core
-       cd drivers/directfb; $(MAKE)
+       cd drivers/directfb ; $(MAKE)
+
+
+#####################################################################
+# fbdev Mesa driver (libGL.so)
+
+fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS)
+       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(GL_LIB_DEPS)
 
 
 ######################################################################

diff --git a/src/mesa/sources b/src/mesa/sources
index 905052d460f2629968a95bae0c0feba0c05c9880..4eb5ae748fa55ab6f4f642837089d48e72aca093 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -337,6 +337,8 @@ OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
+FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o)
+
 
 
 ### Include directories