Merge branch 'mesa_7_5_branch'

[mesa.git] / src / mesa / glapi / Makefile

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 8098f1b314023f79bb360308be5dfa292d487b04..2178eacef5ef44bf7eef29b78ff8baf38c3df1de 100644 (file)
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -20,7 +20,7 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
        ../../glx/x11/indirect_size.c
 
 
-GLX_DIR = $(XORG_BASE)/GL/glx
+GLX_DIR = $(XORG_BASE)/glx
 
 SERVER_GLAPI_FILES = \
        $(GLX_DIR)/glapi.h \
@@ -47,7 +47,12 @@ SERVER_OUTPUTS = \
 
 API_XML = gl_API.xml \
        EXT_framebuffer_object.xml \
-       APPLE_vertex_array_object.xml
+       ARB_copy_buffer.xml \
+       ARB_framebuffer_object.xml \
+       ARB_map_buffer_range.xml \
+       ARB_vertex_array_object.xml \
+       APPLE_vertex_array_object.xml \
+       EXT_provoking_vertex.xml
 
 COMMON = gl_XML.py glX_XML.py license.py $(API_XML) typeexpr.py
 COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
@@ -55,7 +60,7 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 all: check-xorg-source $(OUTPUTS) $(SERVER_OUTPUTS)
 
 check-xorg-source:
-       @if ! test -d $(XORG_BASE)/GL/glx; then \
+       @if ! test -d $(GLX_DIR); then \
                echo "ERROR: Must specify path to xserver checkout; set XORG_BASE."; \
                exit 1; \
        fi