bring in changes from 6.4 branch

[mesa.git] / src / glx / x11 / Makefile

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index ee2bae128d809f911e8aa8b0d9f64a7de3019b7c..84e244501ae86a89fbee214301de9f5d2416608a 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -1,38 +1,23 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-# This is a bit messy.  We want this libGL to be capable of loading old
-# interface drivers, so we have to turn off DRI_NEW_INTERFACE_ONLY.  However,
-# glcontextmodes.c is built elsewhere with DNIO on, so we symlink it across.
-# 
-# Furthermore, context creation has evolved over the years, such that this
-# code will not build with DNIO defined.  When we finally drop old interface
-# support in libGL, we need to clean up both glxcmds.c and dri_interface.h.
-
-DEFINES += -DGLX_DIRECT_RENDERING -DGLXEXT -DXF86DRI -DGLX_USE_DLOPEN \
-       -DGLX_USE_MESA -DXF86VIDMODE -D_REENTRANT -UDRI_NEW_INTERFACE_ONLY
-
-C_SOURCES = \
-         $(TOP)/src/mesa/glapi/glapi.c \
-         $(TOP)/src/mesa/glapi/glthread.c \
+DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
+
+SOURCES = \
          glcontextmodes.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \
          clientattrib.c \
          compsize.c \
-         dispatch.c \
          eval.c \
-         g_render.c \
-         g_single.c \
-         g_vendpriv.c \
          glxcmds.c \
          glxext.c \
          glxextensions.c \
+         indirect.c \
          indirect_init.c \
+         indirect_size.c \
          indirect_window_pos.c \
          indirect_transpose_matrix.c \
+         indirect_vertex_array.c \
+         indirect_vertex_program.c \
          pixel.c \
          pixelstore.c \
          render2.c \
@@ -45,30 +30,24 @@ C_SOURCES = \
          glx_query.c \
          glx_texture_compression.c \
          dri_glx.c \
-         XF86dri.c \
-
-X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
+         XF86dri.c
 
-# ASM_SOURCES = $(X86_SOURCES)
+include $(TOP)/src/mesa/sources
 
-OBJECTS = $(C_SOURCES:.c=.o) \
-         $(ASM_SOURCES:.S=.o)
+MESA_ASM_API = $(addprefix $(TOP)/src/mesa/, $(ASM_API))
+MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES))
+MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS))
 
-INCLUDES = -I. $(INCLUDE_DIRS)
+OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
 
-INCLUDE_DIRS = \
+INCLUDES = -I. \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
-       -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 \
        -I$(TOP)/src/mesa/drivers/dri/common \
-       -I$(DRM_SOURCE_PATH)/libdrm \
-       -I$(DRM_SOURCE_PATH)/shared
+        `pkg-config --cflags libdrm` \
+       $(X11_INCLUDES)
 
 
 ##### RULES #####
@@ -88,18 +67,15 @@ glcontextmodes.c:
 
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+       $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+               -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
-drmtest: xf86drm.o drmtest.o
-       rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
-
-
-depend: $(C_SOURCES) $(ASM_SOURCES)
+depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
        touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-               > /dev/null 2>&1
+       $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
+               $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) 
 
 
 # Emacs tags