gallium: use new gallium utility code for generating mipmaps

[mesa.git] / src / mesa / Makefile

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 561608fedd6cb5e1c8e8ebe2ac7ba309970dca09..2403223db21c4b73a805bb019b35dc8e81f9996b 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -11,19 +11,6 @@ GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 
-PIPE_LIB = \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-       $(TOP)/src/gallium/drivers/i965simple/libi965simple.a
-
-ifeq ($(CONFIG_NAME), linux-cell)
-CELL_LIB = $(TOP)/src/gallium/drivers/cell/ppu/libcell.a
-CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-endif
-
-ifeq ($(CONFIG_NAME), linux-llvm)
-LLVM_LIB = $(TOP)/src/gallium/aux/llvm/libgallivm.a
-endif
-
 .SUFFIXES : .cpp
 
 .c.o:
@@ -36,33 +23,14 @@ endif
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
 
-# Figure out what to make here
-default:
-       @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               $(MAKE) linux-solo ; \
-       elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               $(MAKE) osmesa-only ; \
-       elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
-               $(MAKE) beos ; \
-       elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
-               $(MAKE) directfb ; \
-       elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \
-               $(MAKE) fbdev ; $(MAKE) osmesa-only ; \
-       else \
-               $(MAKE) stand-alone ; \
-       fi
-
+default: depend subdirs libmesa.a
 
-######################################################################
-# BeOS driver target
-
-beos: depend subdirs libmesa.a
-       cd drivers/beos; $(MAKE)
+ifneq ($(DRIVER_DIRS),dri)
+default: libglapi.a
+endif
 
 
 ######################################################################
-# Linux DRI drivers
-
 # Make archive of core object files
 libmesa.a: $(SOLO_OBJECTS)
        @ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);
@@ -70,32 +38,8 @@ libmesa.a: $(SOLO_OBJECTS)
                mimeset -f "$@" ; \
        fi
 
-linux-solo: depend subdirs libmesa.a
-       cd $(TOP)/src/gallium/winsys/dri ; $(MAKE)
-
-
-#####################################################################
-# Stand-alone Mesa libGL, no built-in drivers (DirectFB)
-
-libgl-core: $(CORE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
-               $(GL_LIB_DEPS)
-
-directfb: depend subdirs libgl-core
-       cd drivers/directfb ; $(MAKE)
-
-
-#####################################################################
-# fbdev Mesa driver (libGL.so)
-
-fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-               $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
-               $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)
+libglapi.a: $(GLAPI_OBJECTS)
+       @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
 
 
 ######################################################################
@@ -123,13 +67,13 @@ stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$
 osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU)
        @ $(TOP)/bin/mklib -o $(GL_LIB) \
                -linker "$(CC)" \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
                -install $(TOP)/$(LIB_DIR) \
                $(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \
-               $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB) $(GL_LIB_DEPS)
+               $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
 
 # Make the OSMesa library
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) \
@@ -176,9 +120,6 @@ install: default
        @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
                $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \
        fi
-       @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               cd $(TOP)/gallium/winsys/dri ; $(MAKE) install ; \
-       fi
 
 ## NOT INSTALLED YET:
 ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
@@ -192,9 +133,8 @@ tags:
 clean:
        -rm -f */*.o
        -rm -f */*/*.o
-       -rm -f depend depend.bak libmesa.a
+       -rm -f depend depend.bak libmesa.a libglapi.a
        -rm -f drivers/*/*.o
-       (cd drivers/dri && $(MAKE) clean)
        (cd x86 && $(MAKE) clean)
        (cd x86-64 && $(MAKE) clean)