[Mesa-dev] [PATCH] mesa: Remove the generated glapi from source control, and just build it.

[Eric Anholt]

Mesa already always depends on python to build.  The checked in
changes are not reviewed (because any trivial change rewrites the
world).  We also have been pushing commits between xml change and
regen where at-build-time xml-generated code disagrees with committed
xml-generated code.  And worst of all, sometimes we ("I") check in
*stale* xml-generated code.
---

I dropped the giant file removals from the diff output to fit on the
mailing list.

This doesn't fix the make clean requirement in Mesa, because
makedepend appears to be just plain broken.  However, my upcoming
automake series does fix it by not using makedepend.  Modifying glapi
and typing "make", woo!

 configure.ac                    |    2 +-
 src/glx/.gitignore              |    6 +
 src/glx/indirect.c              |10736 -----------
 src/glx/indirect.h              |  722 -
 src/glx/indirect_init.c         |  789 -
 src/glx/indirect_size.c         |  382 -
 src/glx/indirect_size.h         |   85 -
 src/mapi/glapi/.gitignore       |    9 +
 src/mapi/glapi/gen/Makefile     |    3 +-
 src/mapi/glapi/glapi_gentable.c | 9530 ----------
 src/mapi/glapi/glapi_mapi_tmp.h |14139 ---------------
 src/mapi/glapi/glapi_sparc.S    | 1613 --
 src/mapi/glapi/glapi_x86-64.S   |37708 ---------------------------------------
 src/mapi/glapi/glapi_x86.S      | 1528 --
 src/mapi/glapi/glapitable.h     | 1023 --
 src/mapi/glapi/glapitemp.h      | 9742 ----------
 src/mapi/glapi/glprocs.h        | 2853 ---
 src/mesa/main/.gitignore        |    3 +
 src/mesa/main/dispatch.h        |12958 --------------
 src/mesa/main/enums.c           | 6638 -------
 src/mesa/main/remap_helper.h    | 5818 ------
 21 files changed, 21 insertions(+), 116266 deletions(-)
 delete mode 100644 src/glx/indirect.c
 delete mode 100644 src/glx/indirect.h
 delete mode 100644 src/glx/indirect_init.c
 delete mode 100644 src/glx/indirect_size.c
 delete mode 100644 src/glx/indirect_size.h
 delete mode 100644 src/mapi/glapi/glapi_gentable.c
 delete mode 100644 src/mapi/glapi/glapi_mapi_tmp.h
 delete mode 100644 src/mapi/glapi/glapi_sparc.S
 delete mode 100644 src/mapi/glapi/glapi_x86-64.S
 delete mode 100644 src/mapi/glapi/glapi_x86.S
 delete mode 100644 src/mapi/glapi/glapitable.h
 delete mode 100644 src/mapi/glapi/glapitemp.h
 delete mode 100644 src/mapi/glapi/glprocs.h
 delete mode 100644 src/mesa/main/dispatch.h
 delete mode 100644 src/mesa/main/enums.c
 delete mode 100644 src/mesa/main/remap_helper.h

diff --git a/configure.ac b/configure.ac
index 5ccf77d..ca2220f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,7 +836,7 @@ fi
 # build glsl and mesa if OpenGL or OpenGL ES is enabled
 case "x$enable_opengl$enable_gles1$enable_gles2" in
 x*yes*)
-    CORE_DIRS="$CORE_DIRS glsl mesa"
+    CORE_DIRS="mapi/glapi/gen $CORE_DIRS glsl mesa"
     ;;
 esac
 
diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index 010d3f2..87c2d58 100644
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -2,3 +2,9 @@ Makefile
 Makefile.in
 libGL.la
 libglx.la
+indirect.c
+indirect.h
+indirect_init.c
+indirect_size.c
+indirect_size.h
+
diff --git a/src/mapi/glapi/.gitignore b/src/mapi/glapi/.gitignore
index e706bc2..21edf4f 100644
--- a/src/mapi/glapi/.gitignore
+++ b/src/mapi/glapi/.gitignore
@@ -9,3 +9,12 @@ gl_XML.pyo
 gl_XML.pyc
 glX_XML.pyo
 glX_XML.pyc
+glapi_gentable.c
+glapi_gentable.h
+glapi_mapi_tmp.h
+glapi_sparc.S
+glapi_x86-64.S
+glapi_x86.S
+glapitable.h
+glapitemp.h
+glprocs.h
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 49dfd75..5ca7050 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -121,7 +121,8 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 
 ######################################################################
 
-all: mesa xorg
+all: mesa
+install: mesa
 
 mesa: $(MESA_OUTPUTS)
 
diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore
index d0744e3..caed74f 100644
--- a/src/mesa/main/.gitignore
+++ b/src/mesa/main/.gitignore
@@ -1,5 +1,7 @@
 api_exec_es1.c
 api_exec_es2.c
+dispatch.h
+enums.c
 get_es1.c
 get_es2.c
 git_sha1.h
@@ -8,3 +10,4 @@ api_exec_es1_dispatch.h
 api_exec_es1_remap_helper.h
 api_exec_es2_dispatch.h
 api_exec_es2_remap_helper.h
+remap_helper.h
-- 
1.7.10