From 88a436a8f7278040a56ea63b99c938daa0d17970 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Tue, 15 Jan 2008 19:25:41 -0800 Subject: glapi: Generate xserver glapi sources in the mesa tree Instead of generating the glapi sources for the xserver and commiting them to the xserver tree, we can keep them in the mesa tree and change the xserver build to use the files from the mesa tree. This makes the xserver glx build more robust as it reduces the chances for mismatches of the glX API used in the xserver vs. in mesa. (cherry picked from commit 7688791fc52f116eea421fda1d17aba5cf10977b) --- src/mesa/glapi/Makefile | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile index 7b240a21af4..6520f75e134 100644 --- a/src/mesa/glapi/Makefile +++ b/src/mesa/glapi/Makefile @@ -7,23 +7,20 @@ TOP = ../../.. include $(TOP)/configs/current +GLX_DIR = ../../glx/x11 + OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \ ../main/enums.c \ ../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_size.h \ - ../../glx/x11/indirect_size.c - - -#XORG_BASE = /home/idr/devel/graphics/Xorg/xserver/xorg -GLX_DIR = $(XORG_BASE)/GL/glx - -SERVER_OUTPUTS = $(GLX_DIR)/indirect_dispatch.c \ + $(GLX_DIR)/indirect.c \ + $(GLX_DIR)/indirect.h \ + $(GLX_DIR)/indirect_init.c \ + $(GLX_DIR)/indirect_size.h \ + $(GLX_DIR)/indirect_size.c \ + $(GLX_DIR)/indirect_dispatch.c \ $(GLX_DIR)/indirect_dispatch_swap.c \ $(GLX_DIR)/indirect_dispatch.h \ $(GLX_DIR)/indirect_reqsize.c \ @@ -41,8 +38,6 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py all: $(OUTPUTS) -server: $(SERVER_OUTPUTS) - glprocs.h: gl_procs.py $(COMMON) $(PYTHON2) $(PYTHON_FLAGS) $< > $@ @@ -74,20 +69,20 @@ dispatch.h: gl_table.py $(COMMON) ../drivers/dri/common/extension_helper.h: extension_helper.py $(COMMON) $(PYTHON2) $(PYTHON_FLAGS) $< > $@ -../../glx/x11/indirect.c: glX_proto_send.py $(COMMON_GLX) +$(GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX) $(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@ -../../glx/x11/indirect.h: glX_proto_send.py $(COMMON_GLX) +$(GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX) $(PYTHON2) $(PYTHON_FLAGS) $< -m init_h > $@ -../../glx/x11/indirect_init.c: glX_proto_send.py $(COMMON_GLX) +$(GLX_DIR)/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_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: glX_proto_size.py $(COMMON_GLX) +$(GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX) $(PYTHON2) $(PYTHON_FLAGS) $< -m size_c --only-set \ | $(INDENT) $(INDENT_FLAGS) > $@ -- cgit v1.2.3