glapi: fix es after mv

diff --git a/Makefile b/Makefile
index ea5751d947a6c1666faa3297bfb18e9643f7d3bb..3e92e1312ede1816319280a8f5ff32ad4527d896 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -314,9 +314,9 @@ MAIN_FILES = \
 ES_FILES = \
        $(DIRECTORY)/include/GLES/*.h                                   \
        $(DIRECTORY)/include/GLES2/*.h                                  \
-       $(DIRECTORY)/src/mesa/glapi/*.xml                               \
-       $(DIRECTORY)/src/mesa/glapi/*.py                                \
-       $(DIRECTORY)/src/mesa/glapi/*.dtd                               \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.xml                           \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.py                            \
+       $(DIRECTORY)/src/mesa/glapi/gen/*.dtd                           \
        $(DIRECTORY)/src/mesa/es/glapi/Makefile                         \
        $(DIRECTORY)/src/mesa/es/glapi/*.xml                            \
        $(DIRECTORY)/src/mesa/es/glapi/*.py                             \

diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile
index 1e32af867d5823cf5aca9b1c5fb290a23d7e12f8..e8a9afab7c578d0c71ee093cc679de2ce46172b9 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 :=                     \

diff --git a/src/mesa/es/glapi/base1_API.xml b/src/mesa/es/glapi/base1_API.xml
index f5d136ccefc2a580e94da41ab3a93bc7eff05ae7..72e41282726cb5882a026abbbc52d58575868330 100644 (file)
--- a/src/mesa/es/glapi/base1_API.xml
+++ b/src/mesa/es/glapi/base1_API.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL and OpenGL ES 1.x APIs
      This file defines the base categories that can be shared by all APIs.

diff --git a/src/mesa/es/glapi/base2_API.xml b/src/mesa/es/glapi/base2_API.xml
index 6aa43b728abceb39940a35a8bdde8e187a89683f..5657b8e775e513dff76a3c9cbfadeef96c25cec2 100644 (file)
--- a/src/mesa/es/glapi/base2_API.xml
+++ b/src/mesa/es/glapi/base2_API.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL and OpenGL ES 2.x APIs -->
 

diff --git a/src/mesa/es/glapi/es1_API.xml b/src/mesa/es/glapi/es1_API.xml
index 7ee5515f1977151a6e41b88d3284d015b288bcfc..1ac14674583ba9d5e3e4ec191f160ee3e1fe12ac 100644 (file)
--- a/src/mesa/es/glapi/es1_API.xml
+++ b/src/mesa/es/glapi/es1_API.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL ES 1.x API -->
 

diff --git a/src/mesa/es/glapi/es1_COMPAT.xml b/src/mesa/es/glapi/es1_COMPAT.xml
index 4fc9223cc06ba4a85012acefa5c5646c4831042e..1f45a8c0b641f4cc48b3d18a25e6d81ba704eca7 100644 (file)
--- a/src/mesa/es/glapi/es1_COMPAT.xml
+++ b/src/mesa/es/glapi/es1_COMPAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <OpenGLAPI>
 

diff --git a/src/mesa/es/glapi/es1_EXT.xml b/src/mesa/es/glapi/es1_EXT.xml
index de4868cfd4d616c10fcac446d426a727d9ffdfff..d4abd81046bee3d1e257297638202691f24c827c 100644 (file)
--- a/src/mesa/es/glapi/es1_EXT.xml
+++ b/src/mesa/es/glapi/es1_EXT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL ES 1.x extensions -->
 

diff --git a/src/mesa/es/glapi/es2_API.xml b/src/mesa/es/glapi/es2_API.xml
index 266c07613ce1a33ef2f5263006b1d2796fdd5297..b476dbe00f2a0e1dfdbde5f5f390e6f58e2fe582 100644 (file)
--- a/src/mesa/es/glapi/es2_API.xml
+++ b/src/mesa/es/glapi/es2_API.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL ES 2.x API -->
 

diff --git a/src/mesa/es/glapi/es2_COMPAT.xml b/src/mesa/es/glapi/es2_COMPAT.xml
index 61f11a604e291f51f679fb14617ba649e5df9d4e..5ecd4a1ba6e972395496998308ef8f7a38553f0d 100644 (file)
--- a/src/mesa/es/glapi/es2_COMPAT.xml
+++ b/src/mesa/es/glapi/es2_COMPAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <OpenGLAPI>
 

diff --git a/src/mesa/es/glapi/es2_EXT.xml b/src/mesa/es/glapi/es2_EXT.xml
index 3615772b56f8db49dc6c5d5d2097ce9dbfe4e4e9..dcf9858569fa42f3776acff88969d4a10a89e98d 100644 (file)
--- a/src/mesa/es/glapi/es2_EXT.xml
+++ b/src/mesa/es/glapi/es2_EXT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL ES 2.x extensions -->
 

diff --git a/src/mesa/es/glapi/es_COMPAT.xml b/src/mesa/es/glapi/es_COMPAT.xml
index bb6d28db83d1252cccaddd252555c04b91d29f5e..1bd66dad30684974738b3bd3ac9d7c759f26d7fc 100644 (file)
--- a/src/mesa/es/glapi/es_COMPAT.xml
+++ b/src/mesa/es/glapi/es_COMPAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <OpenGLAPI>
 
@@ -2641,6 +2641,6 @@
     </function>
 </category>
 
-<xi:include href="../../glapi/APPLE_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="../../glapi/gen/APPLE_vertex_array_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 </OpenGLAPI>

diff --git a/src/mesa/es/glapi/es_EXT.xml b/src/mesa/es/glapi/es_EXT.xml
index b76cda929ae94331eb181086dd436d3bc723c473..629ba90528cfc9b1204d22c60d20a02b0d9dace9 100644 (file)
--- a/src/mesa/es/glapi/es_EXT.xml
+++ b/src/mesa/es/glapi/es_EXT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gl_API.dtd">
+<!DOCTYPE OpenGLAPI SYSTEM "../../glapi/gen/gl_API.dtd">
 
 <!-- OpenGL ES extensions -->
 

diff --git a/src/mesa/es/glapi/gl_compare.py b/src/mesa/es/glapi/gl_compare.py
index 7a2148cb1fcd1f5d69a9527d7c4a3b9e8e7c8713..6b5e43bb98b339c8181bfd7245f090307d750d98 100644 (file)
--- a/src/mesa/es/glapi/gl_compare.py
+++ b/src/mesa/es/glapi/gl_compare.py
@@ -25,7 +25,7 @@ import sys
 import os.path
 import getopt
 
-GLAPI = "../../glapi"
+GLAPI = "../../glapi/gen"
 sys.path.append(GLAPI)
 
 import gl_XML

diff --git a/src/mesa/es/glapi/gl_parse_header.py b/src/mesa/es/glapi/gl_parse_header.py
index 8b8d16b395172365321c82c43603bf4c55effa46..5382eba35c39495b614c034c1b259a3a6c1732ae 100644 (file)
--- a/src/mesa/es/glapi/gl_parse_header.py
+++ b/src/mesa/es/glapi/gl_parse_header.py
@@ -26,7 +26,7 @@ import os.path
 import getopt
 import re
 
-GLAPI = "../../glapi"
+GLAPI = "../../glapi/gen"
 sys.path.append(GLAPI)
 
 class HeaderParser(object):