summaryrefslogtreecommitdiffstats
path: root/src/mapi/glapi/gen/Makefile
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2011-06-08 22:24:32 +0800
committerChia-I Wu <[email protected]>2011-06-08 23:19:01 +0800
commit4bb748b609288205ddea750550185d7642025bff (patch)
tree30b031eaaccb8ee29b25ffad9916422706377f9b /src/mapi/glapi/gen/Makefile
parent0dc45374f2c62e33680f3a5729a18ba9ee40cd4d (diff)
mesa: merge glapidispatch.h into dispatch.h
glapidispatch.h was located in glapi and shared with mesa core. Because the way it was shared, mesa core must include it indirectly via main/dispatch.h. Now that it is no longer needed by glapi and is located in core mesa, merging it with main/dispatch.h to avoid wrong uses.
Diffstat (limited to 'src/mapi/glapi/gen/Makefile')
-rw-r--r--src/mapi/glapi/gen/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index c3829dc005e..7415bdc5267 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -27,7 +27,7 @@ MESA_OUTPUTS = \
$(MESA_GLAPI_OUTPUTS) \
$(MESA_GLAPI_ASM_OUTPUTS) \
$(MESA_DIR)/main/enums.c \
- $(MESA_DIR)/main/glapidispatch.h \
+ $(MESA_DIR)/main/dispatch.h \
$(MESA_DIR)/main/remap_helper.h \
$(MESA_GLX_DIR)/indirect.c \
$(MESA_GLX_DIR)/indirect.h \
@@ -180,7 +180,7 @@ $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(ES_API)
-f $(MESA_GLAPI_DIR)/gen-es/es1_API.xml \
-f $(MESA_GLAPI_DIR)/gen-es/es2_API.xml > $@
-$(MESA_DIR)/main/glapidispatch.h: gl_table.py $(COMMON)
+$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)