Merge branch '7.8' into master

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

diff --git a/src/mesa/drivers/dri/i810/Makefile b/src/mesa/drivers/dri/i810/Makefile
index 51299cf4011f309705def7442174e119e5985c5d..54a837d5ea9a5be8f5181bb4caebea1188f288b4 100644 (file)
--- a/src/mesa/drivers/dri/i810/Makefile
+++ b/src/mesa/drivers/dri/i810/Makefile
@@ -5,26 +5,6 @@ include $(TOP)/configs/current
 
 LIBNAME = i810_dri.so
 
-DEFINES += \
-       -D_HAVE_SWRAST=1 \
-       -D_HAVE_SWTNL=1 \
-       -D_HAVE_SANITY=1 \
-       -D_HAVE_CODEGEN=1 \
-       -D_HAVE_LIGHTING=1 \
-       -D_HAVE_TEXGEN=1 \
-       -D_HAVE_USERCLIP=1 \
-       -DGLX_DIRECT_RENDERING
-
-# Not yet
-# MINIGLX_SOURCES = server/i810_dri.c 
-
-COMMON_SOURCES = \
-       ../../common/driverfuncs.c \
-        ../common/mm.c \
-        ../common/utils.c \
-        ../common/texmem.c \
-        ../common/vblank.c
-
 DRIVER_SOURCES = \
        i810context.c \
        i810ioctl.c \
@@ -40,79 +20,9 @@ DRIVER_SOURCES = \
 
 C_SOURCES = \
        $(COMMON_SOURCES) \
-       $(MINIGLX_SOURCES) \
        $(DRIVER_SOURCES)
 
-# Include directories
-INCLUDE_DIRS = \
-       -I. \
-       -I../common \
-       -Iserver \
-       -I$(TOP)/src/glx/mini \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mesa/drivers/dri/drm/shared \
-       -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/shader \
-       -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup
-
-# Core Mesa objects
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-# Libraries that the driver shared lib depends on
-LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl -lc
-
-
-ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=$(MESABUILDDIR)/dri/dri.a
-WINLIB=
-else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
-endif
-
 ASM_SOURCES = 
 
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o) 
-
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
-
-.S.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES)  $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(LIB_DIR)/$(LIBNAME)
-
-
-$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-       $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
-               $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
-
-
-depend: $(C_SOURCES) $(ASM_SOURCES)
-       touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-               >& /dev/null
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-clean:
-       -rm -f *.o server/*.o
-
+include ../Makefile.template
 
-include depend