summaryrefslogtreecommitdiff
path: root/src/mesa/glapi/Makefile
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-05-20 17:06:19 -0400
committerKristian Høgsberg <krh@redhat.com>2008-05-21 12:13:39 -0400
commit1b359bc88e4f98f9aab454c270684172ae0e46ca (patch)
treeee9b231c3762da7271aa318b53646059c78e6a2c /src/mesa/glapi/Makefile
parent2217158c3774ca3bb2b66af2b86f7fc8212c2465 (diff)
Revert "glapi: Generate xserver glapi sources in the mesa tree"
This reverts commit 7688791fc52f116eea421fda1d17aba5cf10977b, and takes us back to generating the glapi files straight into the xserver tree. Conflicts: src/glx/x11/indirect_size_get.c
Diffstat (limited to 'src/mesa/glapi/Makefile')
-rw-r--r--src/mesa/glapi/Makefile31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 13f5302b16..5980bd6718 100644
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -7,20 +7,23 @@
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_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/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_dispatch_swap.c \
$(GLX_DIR)/indirect_dispatch.h \
$(GLX_DIR)/indirect_reqsize.c \
@@ -38,6 +41,8 @@ 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) $< > $@
@@ -69,20 +74,20 @@ dispatch.h: gl_table.py $(COMMON)
../drivers/dri/common/extension_helper.h: extension_helper.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< > $@
-$(GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX)
+../../glx/x11/indirect.c: glX_proto_send.py $(COMMON_GLX)
$(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
-$(GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX)
+../../glx/x11/indirect.h: glX_proto_send.py $(COMMON_GLX)
$(PYTHON2) $(PYTHON_FLAGS) $< -m init_h > $@
-$(GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
+../../glx/x11/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
$(PYTHON2) $(PYTHON_FLAGS) $< -m init_c > $@
-$(GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX)
+../../glx/x11/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_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX)
+../../glx/x11/indirect_size.c: glX_proto_size.py $(COMMON_GLX)
$(PYTHON2) $(PYTHON_FLAGS) $< -m size_c --only-set \
| $(INDENT) $(INDENT_FLAGS) > $@