summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i830/Makefile
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-04-08 22:25:29 +0000
committerBrian Paul <[email protected]>2004-04-08 22:25:29 +0000
commit18e9b2e5f838ee18170f229c17974673f5af0024 (patch)
treee6de7e4198abb00fff61c8ef4a2431ddadf0ff18 /src/mesa/drivers/dri/i830/Makefile
parent01eab7c83403b67bda60dcc42cf5fc25c46d797d (diff)
lots of Makefile updates for new build system
Diffstat (limited to 'src/mesa/drivers/dri/i830/Makefile')
-rw-r--r--src/mesa/drivers/dri/i830/Makefile114
1 files changed, 59 insertions, 55 deletions
diff --git a/src/mesa/drivers/dri/i830/Makefile b/src/mesa/drivers/dri/i830/Makefile
index 55a28728cac..a857814a78b 100644
--- a/src/mesa/drivers/dri/i830/Makefile
+++ b/src/mesa/drivers/dri/i830/Makefile
@@ -1,10 +1,9 @@
# src/mesa/drivers/dri/i830/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 = i830_dri.so
DEFINES += \
-D_HAVE_SWRAST=1 \
@@ -14,38 +13,60 @@ DEFINES += \
-D_HAVE_LIGHTING=1 \
-D_HAVE_TEXGEN=1 \
-D_HAVE_USERCLIP=1 \
- -DGLX_DIRECT_RENDERING
+ -DGLX_DIRECT_RENDERING
# Not yet
# MINIGLX_SOURCES = server/i830_dri.c
+COMMON_SOURCES = \
+ ../../common/driverfuncs.c \
+ ../common/mm.c \
+ ../common/utils.c \
+ ../common/texmem.c \
+ ../common/vblank.c \
+ ../common/xmlconfig.c
+
DRIVER_SOURCES = \
- i830_context.c \
- i830_debug.c \
- i830_ioctl.c \
- i830_render.c \
- i830_screen.c \
- i830_span.c \
- i830_state.c \
- i830_tex.c \
- i830_texmem.c \
- i830_texstate.c \
- i830_tris.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)
+ i830_context.c \
+ i830_debug.c \
+ i830_ioctl.c \
+ i830_render.c \
+ i830_screen.c \
+ i830_span.c \
+ i830_state.c \
+ i830_tex.c \
+ i830_texmem.c \
+ i830_texstate.c \
+ i830_tris.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
@@ -56,50 +77,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 i830_dri.so
+default: depend $(LIB_DIR)/$(LIBNAME)
+
-i830_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)/i830_dri.so && \
- install i830_dri.so $(LIB_DIR)/i830_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)/i830_dri.so: i830_dri.so
- rm -f $(LIB_DIR)/i830_dri.so && \
- install i830_dri.so $(LIB_DIR)/i830_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
@@ -107,9 +112,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