diff options
Diffstat (limited to 'src/mesa/drivers/dri/mach64')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/Makefile | 116 |
1 files changed, 60 insertions, 56 deletions
diff --git a/src/mesa/drivers/dri/mach64/Makefile b/src/mesa/drivers/dri/mach64/Makefile index 8cfceafa325..e9ea1c1feec 100644 --- a/src/mesa/drivers/dri/mach64/Makefile +++ b/src/mesa/drivers/dri/mach64/Makefile @@ -1,10 +1,9 @@ # src/mesa/drivers/dri/mach64/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 = mach64_dri.so DEFINES += \ -D_HAVE_SWRAST=1 \ @@ -14,39 +13,61 @@ DEFINES += \ -D_HAVE_LIGHTING=1 \ -D_HAVE_TEXGEN=1 \ -D_HAVE_USERCLIP=1 \ - -DGLX_DIRECT_RENDERING + -DGLX_DIRECT_RENDERING # Not yet # MINIGLX_SOURCES = server/mach64_dri.c +COMMON_SOURCES = \ + ../../common/driverfuncs.c \ + ../common/mm.c \ + ../common/utils.c \ + ../common/texmem.c \ + ../common/vblank.c \ + ../common/xmlconfig.c + DRIVER_SOURCES = \ - mach64_context.c \ - mach64_ioctl.c \ - mach64_screen.c \ - mach64_span.c \ - mach64_state.c \ - mach64_tex.c \ - mach64_texmem.c \ - mach64_texstate.c \ - mach64_tris.c \ - mach64_vb.c \ - mach64_dd.c \ - mach64_lock.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) + mach64_context.c \ + mach64_ioctl.c \ + mach64_screen.c \ + mach64_span.c \ + mach64_state.c \ + mach64_tex.c \ + mach64_texmem.c \ + mach64_texstate.c \ + mach64_tris.c \ + mach64_vb.c \ + mach64_dd.c \ + mach64_lock.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 +78,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 mach64_dri.so +default: depend $(LIB_DIR)/$(LIBNAME) + -mach64_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)/mach64_dri.so && \ - install mach64_dri.so $(LIB_DIR)/mach64_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)/mach64_dri.so: mach64_dri.so - rm -f $(LIB_DIR)/mach64_dri.so && \ - install mach64_dri.so $(LIB_DIR)/mach64_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 + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \ + >& /dev/null # Emacs tags @@ -108,9 +113,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 |