Merge branch '7.8'

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

diff --git a/src/mesa/drivers/dri/swrast/Makefile b/src/mesa/drivers/dri/swrast/Makefile
index eb58f4c73387ec22591cd4a578055fe0a40595d6..d2cf6dbc55b1893cb6c39c0e7070d6d5ee4b271d 100644 (file)
--- a/src/mesa/drivers/dri/swrast/Makefile
+++ b/src/mesa/drivers/dri/swrast/Makefile
@@ -5,70 +5,22 @@ include $(TOP)/configs/current
 
 LIBNAME = swrast_dri.so
 
+DRIVER_DEFINES = -D__NOT_HAVE_DRM_H
+
 DRIVER_SOURCES = \
        swrast.c \
        swrast_span.c
 
 C_SOURCES = \
-       $(COMMON_SOURCES) \
+       $(SWRAST_COMMON_SOURCES) \
        $(DRIVER_SOURCES)
 
-########################################
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-COMMON_SOURCES = \
-       ../../common/driverfuncs.c
-
-ifeq ($(WINDOW_SYSTEM),dri)
-COMMON_SOURCES += \
-       ../common/utils.c
-endif
-
-OBJECTS = $(C_SOURCES:.c=.o)
-
-### Include directories
-INCLUDES = \
-       -I. \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/mesa/glapi
-
-ifeq ($(WINDOW_SYSTEM),dri)
-INCLUDES += \
-       -I$(TOP)/src/mesa/drivers/dri/common \
-       $(LIBDRM_CFLAGS)
-endif
-
-##### RULES #####
-
-.c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
-
-
-##### TARGETS #####
-
-default: depend $(LIBNAME)
-
-
-$(LIBNAME): $(OBJECTS) $(MESA_MODULES) Makefile
-       $(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
-               $(OBJECTS) $(MESA_MODULES) $(GLCORE_LIB_DEPS)
-
-
-depend: $(C_SOURCES)
-       touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) \
-               > /dev/null
-
+ASM_SOURCES =
 
-clean:
-       -rm -f *.o *.so
-       -rm -f depend depend.bak
+SWRAST_COMMON_SOURCES = \
+       ../../common/driverfuncs.c \
+       ../common/utils.c \
+       ../common/drisw_util.c
 
-install: $(LIBNAME)
-       $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-       $(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+include ../Makefile.template
 
-include depend