glapi: Move assembly dispatchers back into glapi/.

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

diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile
index 1e32af867d5823cf5aca9b1c5fb290a23d7e12f8..d12b8a5507bdd7b68d317a209ac2f66838d6a47f 100644 (file)
--- a/src/mesa/es/glapi/Makefile
+++ b/src/mesa/es/glapi/Makefile
@@ -1,5 +1,5 @@
 TOP = ../../../..
-GLAPI = ../../glapi
+GLAPI = ../../glapi/gen
 include $(TOP)/configs/current
 
 OUTPUTS :=                     \
@@ -8,10 +8,9 @@ OUTPUTS :=                     \
        glapi/glapitable.h      \
        glapi/glapitemp.h       \
        glapi/glprocs.h         \
-       sparc/glapi_sparc.S     \
-       x86-64/glapi_x86-64.S   \
-       x86/glapi_x86.S         \
-       main/enums.c            \
+       glapi/glapi_sparc.S     \
+       glapi/glapi_x86-64.S    \
+       glapi/glapi_x86.S       \
        main/remap_helper.h
 
 COMMON = gl_XML.py glX_XML.py license.py typeexpr.py
@@ -30,7 +29,10 @@ ES2_DEPS = $(ES2_APIXML) base2_API.xml es2_EXT.xml es_EXT.xml \
 ES1_OUTPUTS := $(addprefix $(ES1_OUTPUT_DIR)/, $(OUTPUTS))
 ES2_OUTPUTS := $(addprefix $(ES2_OUTPUT_DIR)/, $(OUTPUTS))
 
-all: $(ES1_OUTPUTS) $(ES2_OUTPUTS)
+all: es1 es2
+
+es1: $(ES1_OUTPUTS)
+es2: $(ES2_OUTPUTS)
 
 $(ES1_OUTPUTS): APIXML := $(ES1_APIXML)
 $(ES2_OUTPUTS): APIXML := $(ES2_APIXML)
@@ -57,16 +59,13 @@ endef
 %/glprocs.h: $(GLAPI)/gl_procs.py $(COMMON)
        $(call gen-glapi,-c)
 
-%/sparc/glapi_sparc.S: $(GLAPI)/gl_SPARC_asm.py $(COMMON)
-       $(call gen-glapi)
-
-%/x86-64/glapi_x86-64.S: $(GLAPI)/gl_x86-64_asm.py $(COMMON)
+%/glapi_sparc.S: $(GLAPI)/gl_SPARC_asm.py $(COMMON)
        $(call gen-glapi)
 
-%/x86/glapi_x86.S: $(GLAPI)/gl_x86_asm.py $(COMMON)
+%/glapi_x86-64.S: $(GLAPI)/gl_x86-64_asm.py $(COMMON)
        $(call gen-glapi)
 
-%/main/enums.c: $(GLAPI)/gl_enums.py $(COMMON)
+%/glapi_x86.S: $(GLAPI)/gl_x86_asm.py $(COMMON)
        $(call gen-glapi)
 
 %/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON)