Move fbdev driver construction into src/mesa/drivers/fbdev/Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index defc96b..b6485f3 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -96,6 +96,13 @@ osmesa-driver: depend subdirs libmesa.a libglapi.a
 
 
 #####################################################################
+# fbdev driver (libGL.so)
+
+fbdev-driver: depend subdirs libmesa.a libglapi.a
+       cd drivers/fbdev && $(MAKE)
+
+
+#####################################################################
 # DirectFB driver (libGL.so)
 
 directfb-libgl: $(CORE_OBJECTS)
@@ -108,18 +115,6 @@ directfb-driver: depend subdirs directfb-libgl
        cd drivers/directfb && $(MAKE)
 
 
-#####################################################################
-# fbdev driver (libGL.so)
-
-fbdev-driver: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-               $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
-               $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)
-
-
-
 ######################################################################
 # Generic stuff
 

diff --git a/src/mesa/drivers/fbdev/Makefile b/src/mesa/drivers/fbdev/Makefile
new file mode 100644 (file)
index 0000000..ac43dfd
--- /dev/null
+++ b/src/mesa/drivers/fbdev/Makefile
@@ -0,0 +1,36 @@
+# src/mesa/drivers/fbdev/Makefile for libGL.so
+
+TOP = ../../../..
+
+include $(TOP)/configs/current
+
+
+SOURCES = glfbdev.c
+
+OBJECTS = $(SOURCES:.c=.o)
+
+INCLUDE_DIRS = \
+       -I$(TOP)/include \
+       -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mesa/main
+
+CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+
+
+.c.o:
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+
+default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+
+
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(CORE_OBJECTS) $(OBJECTS)
+       @ $(TOP)/bin/mklib -o $(GL_LIB) \
+               -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               $(CORE_MESA) $(OBJECTS) $(GL_LIB_DEPS)
+
+
+clean:
+       -rm -f $(OBJECTS)