Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / gallium / winsys / xlib / Makefile

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 2664ac47ceb077741ee47350f66198fb2d9bea54..11c76324113db8d793601a027e1f2b479e8db3dc 100644 (file)
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -1,9 +1,18 @@
-# src/mesa/Makefile
+# src/gallium/winsys/xlib/Makefile
+
+# This makefile produces a "stand-alone" libGL.so which is based on
+# Xlib (no DRI HW acceleration)
+
 
 TOP = ../../../..
 include $(TOP)/configs/current
 
 
+GL_MAJOR = 1
+GL_MINOR = 5
+GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+
+
 INCLUDE_DIRS = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
@@ -12,7 +21,7 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/gallium/drivers \
        -I$(TOP)/src/gallium/auxiliary
 
-X11_DRIVER_SOURCES = \
+XLIB_WINSYS_SOURCES = \
        glxapi.c        \
        fakeglx.c       \
        xfonts.c        \
@@ -21,26 +30,17 @@ X11_DRIVER_SOURCES = \
        xm_winsys_aub.c \
        brw_aub.c
 
+XLIB_WINSYS_OBJECTS = $(XLIB_WINSYS_SOURCES:.c=.o)
 
-GL_MAJOR = 1
-GL_MINOR = 5
-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
+# Note: CELL_SPU_LIB is only defined for cell configs
 
-PIPE_LIB = \
+LIBS = \
        $(GALLIUM_DRIVERS) \
        $(TOP)/src/mesa/libglapi.a \
        $(TOP)/src/mesa/libmesa.a \
-       $(GALLIUM_AUXILIARIES)
-
-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/auxiliary/llvm/libgallivm.a
-endif
+       $(GALLIUM_AUXILIARIES) \
+       $(CELL_SPU_LIB) \
 
 
 .SUFFIXES : .cpp
@@ -51,36 +51,21 @@ endif
 .cpp.o:
        $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
 
-.S.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
 
 default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
 
-######################################################################
-# Stand-alone Mesa libGL and libOSMesa
-STAND_ALONE_DRIVER_SOURCES = \
-       $(X11_DRIVER_SOURCES)
-
-STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
-
-STAND_ALONE_OBJECTS = \
-       $(STAND_ALONE_DRIVER_OBJECTS)
-
-# Make the GL library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(LLVM_LIB) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU)
+# Make the libGL.so library
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(XLIB_WINSYS_OBJECTS) $(LIBS)
        $(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) \
-               --start-group $(PIPE_LIB) $(LLVM_LIB) --end-group $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
+               $(MKLIB_OPTIONS) $(XLIB_WINSYS_OBJECTS) \
+               --start-group $(LIBS) --end-group $(GL_LIB_DEPS)
 
 
-######################################################################
-# Generic stuff
-
 depend: $(ALL_SOURCES)
        @ echo "running $(MKDEP)"
        @ rm -f depend  # workaround oops on gutsy?!?
@@ -97,10 +82,6 @@ install: default
                $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
        fi
 
-## NOT INSTALLED YET:
-## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
-## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
-
 
 # Emacs tags
 tags: