projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 c52c0903478a0f47928e8c36a352e230f3780788..fb6be1a3a906e729e60a1a1de237b092aada0e08 100644
(file)
--- a/
src/mesa/glapi/Makefile
+++ b/
src/mesa/glapi/Makefile
@@
-7,12
+7,12
@@
TOP = ../../..
include $(TOP)/configs/current
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
glapi
dispatch.h \
../main/enums.c \
../main/enums.c \
+ ../main/remap_helper.h \
../x86/glapi_x86.S \
../x86-64/glapi_x86-64.S \
../sparc/glapi_sparc.S \
../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 \
../../glx/x11/indirect.c \
../../glx/x11/indirect.h \
../../glx/x11/indirect_init.c \
@@
-20,101
+20,134
@@
OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
../../glx/x11/indirect_size.c
../../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_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_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 \
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
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
-INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
+all: check-xorg-source $(OUTPUTS) $(SERVER_OUTPUTS)
-all: $(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: $(COMMON) gl_procs.py
- $(PYTHON2) $(PYTHON_FLAGS) gl_procs.py > glprocs.h
+$(GLX_DIR)/%.h: %.h
+ cp $< $@
-gl
apitemp.h: $(COMMON) gl_apitemp.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_apitemp.py > glapitemp.h
+gl
procs.h $(GLX_DIR)/glprocs.h: gl_procs.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-glapi
offsets.h: $(COMMON) gl_offsets.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_offsets.py > glapioffsets.h
+glapi
temp.h $(GLX_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-glapi
table.h: $(COMMON) gl_table.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_table.py > glapitable.h
+glapi
offsets.h $(GLX_DIR)/glapioffsets.h: gl_offsets.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-dispatch.h: $(COMMON) gl_table.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_table.py -m remap_table > dispatch.h
+glapitable.h $(GLX_DIR)/glapitable.h: gl_table.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-../main/enums.c: $(COMMON) gl_enums.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_enums.py > ../main/enums.c
+glapidispatch.h $(GLX_DIR)/glapidispatch.h: gl_table.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m remap_table > $@
-../
x86/glapi_x86.S: $(COMMON) gl_x86_asm.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_x86_asm.py > ../x86/glapi_x86.S
+../
main/enums.c: gl_enums.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-../
x86-64/glapi_x86-64.S: $(COMMON) gl_x86-64_asm.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_x86-64_asm.py > ../x86-64/glapi_x86-64.S
+../
main/remap_helper.h: remap_helper.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-../
sparc/glapi_sparc.S: $(COMMON) gl_SPARC_asm.py
- $(PYTHON2) $(PYTHON_FLAGS)
gl_SPARC_asm.py > ../sparc/glapi_sparc.S
+../
x86/glapi_x86.S: gl_x86_asm.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
+../x86-64/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS) $< > $@
-../
drivers/dri/common/extension_helper.h: $(COMMON) extension_helper.py
- $(PYTHON2) $(PYTHON_FLAGS)
extension_helper.py > ../drivers/dri/common/extension_helper.h
+../
sparc/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< > $@
-../../glx/x11/indirect.c:
$(COMMON_GLX) glX_proto_send.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_send.py -m proto | indent $(INDENT_FLAGS) > ../../glx/x11/indirect.c
+../../glx/x11/indirect.c:
glX_proto_send.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
-../../glx/x11/indirect.h:
$(COMMON_GLX) glX_proto_send.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_send.py -m init_h > ../../glx/x11/indirect.h
+../../glx/x11/indirect.h:
glX_proto_send.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m init_h > $@
-../../glx/x11/indirect_init.c:
$(COMMON_GLX) glX_proto_send.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_send.py -m init_c > ../../glx/x11/indirect_init.c
+../../glx/x11/indirect_init.c:
glX_proto_send.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m init_c > $@
-../../glx/x11/indirect_size.h: $(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-set -h _INDIRECT_SIZE_H_ | indent $(INDENT_FLAGS) > ../../glx/x11/indirect_size.h
+../../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) > $@
-../../glx/x11/indirect_size.c: $(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c --only-set | indent $(INDENT_FLAGS) > ../../glx/x11/indirect_size.c
+../../glx/x11/indirect_size.c: glX_proto_size.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS) $< -m size_c --only-set \
+ | $(INDENT) $(INDENT_FLAGS) > $@
-$(GLX_DIR)/indirect_dispatch.c:
$(COMMON_GLX) glX_proto_recv.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_recv.py
-m dispatch_c > $@
+$(GLX_DIR)/indirect_dispatch.c:
glX_proto_recv.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$<
-m dispatch_c > $@
-$(GLX_DIR)/indirect_dispatch_swap.c:
$(COMMON_GLX) glX_proto_recv.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_recv.py
-m dispatch_c -s > $@
+$(GLX_DIR)/indirect_dispatch_swap.c:
glX_proto_recv.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$<
-m dispatch_c -s > $@
-$(GLX_DIR)/indirect_dispatch.h:
$(COMMON_GLX) glX_proto_recv.py glX_API.xml
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_recv.py
-m dispatch_h -f gl_and_glX_API.xml -s > $@
+$(GLX_DIR)/indirect_dispatch.h:
glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$<
-m dispatch_h -f gl_and_glX_API.xml -s > $@
-$(GLX_DIR)/indirect_size_get.h: $(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' | indent $(INDENT_FLAGS) > $@
+$(GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' \
+ | $(INDENT) $(INDENT_FLAGS) > $@
-$(GLX_DIR)/indirect_size_get.c:
$(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_size.py -m size_c | indent
$(INDENT_FLAGS) > $@
+$(GLX_DIR)/indirect_size_get.c:
glX_proto_size.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m size_c | $(INDENT)
$(INDENT_FLAGS) > $@
-$(GLX_DIR)/indirect_reqsize.h: $(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m reqsize_h --only-get -h '_INDIRECT_SIZE_GET_H_' | indent $(INDENT_FLAGS) -l200 > $@
+$(GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS) $< -m reqsize_h --only-get -h '_INDIRECT_SIZE_GET_H_' \
+ | $(INDENT) $(INDENT_FLAGS) -l200 > $@
-$(GLX_DIR)/indirect_reqsize.c:
$(COMMON_GLX) glX_proto_size.py
- $(PYTHON2) $(PYTHON_FLAGS)
glX_proto_size.py -m reqsize_c | indent
$(INDENT_FLAGS) > $@
+$(GLX_DIR)/indirect_reqsize.c:
glX_proto_size.py $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$< -m reqsize_c | $(INDENT)
$(INDENT_FLAGS) > $@
-$(GLX_DIR)/indirect_table.c:
$(COMMON_GLX) glX_server_table.py glX_API.xml
- $(PYTHON2) $(PYTHON_FLAGS)
glX_server_table.py
-f gl_and_glX_API.xml > $@
+$(GLX_DIR)/indirect_table.c:
glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX)
+ $(PYTHON2) $(PYTHON_FLAGS)
$<
-f gl_and_glX_API.xml > $@
clean:
clean:
- rm -f *~ *.pyo
- rm -f $(OUTPUTS)
+
-
rm -f *~ *.pyo
+
-
rm -f $(OUTPUTS)