dri/nouveau: Fix build with --enable-shared-dricore.

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

diff --git a/src/mesa/drivers/dri/sis/Makefile b/src/mesa/drivers/dri/sis/Makefile
index bd7b36db5d9b6276b718230d0ecd6ca5de0594fd..0e0bf0d4eac1f2aaeea3a743cd47b3a06bc38c92 100644 (file)
--- a/src/mesa/drivers/dri/sis/Makefile
+++ b/src/mesa/drivers/dri/sis/Makefile
@@ -1,118 +1,34 @@
 # src/mesa/drivers/dri/sis/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 = sis_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/sis_dri.c 
+include ../Makefile.defines
 
 DRIVER_SOURCES = \
-               sis_alloc.c \
-               sis_clear.c \
-               sis_context.c \
-               sis_dd.c \
-               sis_fog.c \
-               sis_lock.c \
-               sis_screen.c \
-               sis_span.c \
-               sis_state.c \
-               sis_stencil.c \
-               sis_tex.c \
-               sis_texstate.c \
-               sis_tris.c \
-               sis_vb.c \
-               ../../common/driverfuncs.c \
-                ../common/mm.c \
-                ../common/utils.c \
-                ../common/texmem.c \
-                ../common/vblank.c
-
-INCLUDES = $(MINIGLX_INCLUDES) \
-          $(SHARED_INCLUDES)
-
-
-C_SOURCES = $(DRIVER_SOURCES) \
-           $(MINIGLX_SOURCES) 
-
-MESA_MODULES = $(TOP)/src/mesa/mesa.a
-
-
-ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=$(MESABUILDDIR)/dri/dri.a
-WINLIB=
-else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
-endif
+       sis6326_state.c \
+       sis6326_clear.c \
+       sis_alloc.c \
+       sis_clear.c \
+       sis_context.c \
+       sis_dd.c \
+       sis_fog.c \
+       sis_lock.c \
+       sis_screen.c \
+       sis_span.c \
+       sis_state.c \
+       sis_stencil.c \
+       sis_tex.c \
+       sis_texstate.c \
+       sis_tris.c
+
+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 sis_dri.so
-
-sis_dri.so:  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile.solo
-       rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(WINLIB) -lc $(GL_LIB_DEPS)
-       rm -f $(LIB_DIR)/sis_dri.so && \
-       install sis_dri.so $(LIB_DIR)/sis_dri.so
-
-$(LIB_DIR)/sis_dri.so: sis_dri.so
-       rm -f $(LIB_DIR)/sis_dri.so && \
-       install sis_dri.so $(LIB_DIR)/sis_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) $(MINIGLX_INCLUDES) \
-               $(C_SOURCES) $(ASM_SOURCES) >& /dev/null
-
-
-# Emacs tags
-tags:
-       etags `find . -name \*.[ch]` `find ../include`
-
-
-# Remove .o and backup files
-clean:
-       -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
 
+include ../Makefile.targets
 
-include depend