From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 18 Aug 2006 20:20:28 +0000 (+0000)
Subject: Fix-ups for linux-fbdev config.  No longer build Xlib driver sources.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92c43b110c22474c5304c782193494c197256ab7;p=mesa.git

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

diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index 3ab6b69c39c..7a5d1b600f9 100644
--- 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 16cf6709ea5..1d2f36f0fba 100644
--- 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 905052d460f..4eb5ae748fa 100644
--- 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