lots of Makefile updates for new build system

1 files changed, 58 insertions, 56 deletions

diff --git a/src/mesa/drivers/dri/i810/Makefile b/src/mesa/drivers/dri/i810/Makefile
index c38a5a334de..51299cf4011 100644
--- a/src/mesa/drivers/dri/i810/Makefile
+++ b/src/mesa/drivers/dri/i810/Makefile
@@ -1,11 +1,9 @@
 # src/mesa/drivers/dri/i810/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 = i810_dri.so
 
 DEFINES += \
 	-D_HAVE_SWRAST=1 \
@@ -15,38 +13,59 @@ DEFINES += \
 	-D_HAVE_LIGHTING=1 \
 	-D_HAVE_TEXGEN=1 \
 	-D_HAVE_USERCLIP=1 \
-	-DGLX_DIRECT_RENDERING 
+	-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 \
-		i810render.c \
-		i810screen.c \
-		i810span.c \
-		i810state.c \
-		i810tex.c \
-		i810texmem.c \
-		i810texstate.c \
-		i810tris.c \
-		i810vb.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) 
+	i810context.c \
+	i810ioctl.c \
+	i810render.c \
+	i810screen.c \
+	i810span.c \
+	i810state.c \
+	i810tex.c \
+	i810texmem.c \
+	i810texstate.c \
+	i810tris.c \
+	i810vb.c
+
+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
@@ -57,50 +76,34 @@ WINLIB=-L$(MESA)/src/glx/mini
 endif
 
 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 $@
+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
 
 .S.o:
-	$(CC) -c $(SHARED_INCLUDES) $(MINIGLX_INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES)  $< -o $@
 
 
 ##### TARGETS #####
 
-default: depend i810_dri.so
+default: depend $(LIB_DIR)/$(LIBNAME)
+
 
-i810_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)/i810_dri.so && \
-	install i810_dri.so $(LIB_DIR)/i810_dri.so
+$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
+	$(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
+		$(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
 
-$(LIB_DIR)/i810_dri.so:	i810_dri.so
-	rm -f $(LIB_DIR)/i810_dri.so && \
-	install i810_dri.so $(LIB_DIR)/i810_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)
+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
+		>& /dev/null
 
 
 # Emacs tags
@@ -108,9 +111,8 @@ tags:
 	etags `find . -name \*.[ch]` `find ../include`
 
 
-# Remove .o and backup files
 clean:
-	-rm -f *.o */*.o *~ *.o *~ *.so server/*.o
+	-rm -f *.o server/*.o
 
 
 include depend