glapi: Include headers with directory prefixes.

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

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 5980bd6718554c5f9dcf3888e655c87621dda263..fb6be1a3a906e729e60a1a1de237b092aada0e08 100644 (file)
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -7,12 +7,12 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
+OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h glapidispatch.h \
        ../main/enums.c \
+       ../main/remap_helper.h \
        ../x86/glapi_x86.S \
        ../x86-64/glapi_x86-64.S \
        ../sparc/glapi_sparc.S \
-       ../drivers/dri/common/extension_helper.h \
        ../../glx/x11/indirect.c \
        ../../glx/x11/indirect.h \
        ../../glx/x11/indirect_init.c \
@@ -20,47 +20,82 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
        ../../glx/x11/indirect_size.c
 
 
-#XORG_BASE = /home/idr/devel/graphics/Xorg/xserver/xorg
-GLX_DIR   = $(XORG_BASE)/GL/glx
+GLX_DIR = $(XORG_BASE)/glx
 
-SERVER_OUTPUTS = $(GLX_DIR)/indirect_dispatch.c \
+SERVER_GLAPI_FILES = \
+       $(GLX_DIR)/glapi.h \
+       $(GLX_DIR)/glapi.c \
+       $(GLX_DIR)/glthread.c \
+       $(GLX_DIR)/glthread.h
+
+SERVER_OUTPUTS = \
+       $(GLX_DIR)/indirect_dispatch.c \
        $(GLX_DIR)/indirect_dispatch_swap.c \
        $(GLX_DIR)/indirect_dispatch.h \
        $(GLX_DIR)/indirect_reqsize.c \
        $(GLX_DIR)/indirect_reqsize.h \
+       $(GLX_DIR)/indirect_size.h \
        $(GLX_DIR)/indirect_size_get.c \
        $(GLX_DIR)/indirect_size_get.h \
-       $(GLX_DIR)/indirect_table.c
+       $(GLX_DIR)/indirect_table.c \
+       $(GLX_DIR)/glapitemp.h \
+       $(GLX_DIR)/glapitable.h \
+       $(GLX_DIR)/glapioffsets.h \
+       $(GLX_DIR)/glapidispatch.h \
+       $(GLX_DIR)/glprocs.h \
+       $(GLX_DIR)/dispatch.h \
+       $(SERVER_GLAPI_FILES)
 
 API_XML = gl_API.xml \
        EXT_framebuffer_object.xml \
-       APPLE_vertex_array_object.xml
+       ARB_copy_buffer.xml \
+       ARB_depth_clamp.xml \
+       ARB_framebuffer_object.xml \
+       ARB_map_buffer_range.xml \
+       ARB_seamless_cube_map.xml \
+       ARB_sync.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
 
-all: $(OUTPUTS)
+all: check-xorg-source $(OUTPUTS) $(SERVER_OUTPUTS)
+
+check-xorg-source:
+       @if ! test -d $(GLX_DIR); then \
+               echo "ERROR: Must specify path to xserver checkout; set XORG_BASE."; \
+               exit 1; \
+       fi
 
-server: $(SERVER_OUTPUTS)
+$(GLX_DIR)/%.c: %.c
+       cp $< $@
 
-glprocs.h: gl_procs.py $(COMMON)
+$(GLX_DIR)/%.h: %.h
+       cp $< $@
+
+glprocs.h $(GLX_DIR)/glprocs.h: gl_procs.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-glapitemp.h: gl_apitemp.py $(COMMON)
+glapitemp.h $(GLX_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-glapioffsets.h: gl_offsets.py $(COMMON)
+glapioffsets.h $(GLX_DIR)/glapioffsets.h: gl_offsets.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-glapitable.h: gl_table.py $(COMMON)
+glapitable.h $(GLX_DIR)/glapitable.h: gl_table.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-dispatch.h: gl_table.py $(COMMON)
+glapidispatch.h $(GLX_DIR)/glapidispatch.h: gl_table.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
 
 ../main/enums.c: gl_enums.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
+../main/remap_helper.h: remap_helper.py $(COMMON)
+       $(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
 ../x86/glapi_x86.S: gl_x86_asm.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
@@ -70,10 +105,6 @@ dispatch.h: gl_table.py $(COMMON)
 ../sparc/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-
-../drivers/dri/common/extension_helper.h: extension_helper.py $(COMMON)
-       $(PYTHON2) $(PYTHON_FLAGS) $< > $@
-
 ../../glx/x11/indirect.c: glX_proto_send.py $(COMMON_GLX)
        $(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
 
@@ -83,7 +114,7 @@ dispatch.h: gl_table.py $(COMMON)
 ../../glx/x11/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
        $(PYTHON2) $(PYTHON_FLAGS) $< -m init_c > $@
 
-../../glx/x11/indirect_size.h: glX_proto_size.py $(COMMON_GLX)
+../../glx/x11/indirect_size.h $(GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX)
        $(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-set -h _INDIRECT_SIZE_H_ \
          | $(INDENT) $(INDENT_FLAGS) > $@