fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / fb / Makefile

diff --git a/src/mesa/drivers/dri/fb/Makefile b/src/mesa/drivers/dri/fb/Makefile
index 2d1253e04bdcbd35092171765da0836e0a52e4df..bebacf8b27108228739279c52fff65496b88f063 100644 (file)
--- a/src/mesa/drivers/dri/fb/Makefile
+++ b/src/mesa/drivers/dri/fb/Makefile
@@ -1,75 +1,24 @@
 # src/mesa/drivers/dri/fb/Makefile
 
 TOP = ../../../../..
-include $(TOP)/configs/default
+include $(TOP)/configs/current
 
-SHARED_INCLUDES = $(INCLUDE_DIRS) -I. -I../common -Iserver
-MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
+LIBNAME = fb_dri.so
 
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
+DRIVER_SOURCES = \
+       fb_dri.c \
+       fb_egl.c
 
-DRIVER_SOURCES = fb_dri.c
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(DRI_SOURCES) 
+C_SOURCES = \
+       $(COMMON_SOURCES) \
+       $(DRIVER_SOURCES)
 
 ASM_SOURCES = 
 
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) 
-
-
-### Include directories
-
-INCLUDE_DIRS = \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/math \
-       -I$(TOP)/src/mesa/transform \
-       -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend fb_dri.so
-
-fb_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
-       rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc -lm
-       rm -f $(LIB_DIR)/fb_dri.so && \
-       install fb_dri.so $(LIB_DIR)/fb_dri.so
-
-$(LIB_DIR)/fb_dri.so:  fb_dri.so
-       rm -f $(LIB_DIR)/fb_dri.so && \
-       install fb_dri.so $(LIB_DIR)/fb_dri.so
-
-# Run 'make -f Makefile.solo dep' to update the dependencies if you change
-# what's included by any source file.
-depend: $(C_SOURCES) $(ASM_SOURCES)
-       touch depend
-       makedepend -fdepend -Y $(SHARED_INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
+# XXX not 100% sure this is right
+WINDOW_SYSTEM = solo
 
+include ../Makefile.template
 
-# Remove .o and backup files
-clean:
-       -rm -f *.o *~ *.o *~ *.so
+symlinks:
 
-include depend