[PATCH 3/3] hw/xwin: wglext.h should be provided by w32api, rather than downloaded

[Jon TURNEY]

wglext.h should be provided by the w32api package, rather than downloaded.
if it's not, do 'wget -P /usr/include/w32api/GL http://www.opengl.org/registry/api/wglext.h'

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 hw/xwin/glx/.gitignore    |    3 +--
 hw/xwin/glx/Makefile.am   |   10 ++--------
 hw/xwin/glx/wgl_ext_api.c |    2 +-
 hw/xwin/glx/wgl_ext_api.h |    2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/hw/xwin/glx/.gitignore b/hw/xwin/glx/.gitignore
index 20d1c1e..062fd85 100644
--- a/hw/xwin/glx/.gitignore
+++ b/hw/xwin/glx/.gitignore
@@ -1,4 +1,3 @@
-# ignore downloaded and generated files
+# ignore generated files
 generated_gl_wrappers.c
 generated_wgl_wrappers.c
-wglext.h
diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
index fce1aad..5683dd5 100644
--- a/hw/xwin/glx/Makefile.am
+++ b/hw/xwin/glx/Makefile.am
@@ -26,9 +26,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
             -I$(top_srcdir)/hw/xwin/
 
 glwrap.c: generated_gl_wrappers.c
-wgl_ext_api.c: generated_wgl_wrappers.c wglext.h
-wgl_ext_api.h: wglext.h
-indirect.c: wgl_ext_api.h
+wgl_ext_api.c: generated_wgl_wrappers.c
 
 generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONOS_SPEC_DIR)/gl.tm
 	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/gl.spec --typemap=$(KHRONOS_SPEC_DIR)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c
@@ -36,11 +34,7 @@ generated_gl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.spec $(KHRONO
 generated_wgl_wrappers.c: gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wglext.spec $(KHRONOS_SPEC_DIR)/wgl.tm
 	$(srcdir)/gen_gl_wrappers.py --spec=$(KHRONOS_SPEC_DIR)/wglext.spec --typemap=$(KHRONOS_SPEC_DIR)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
 
-wglext.h:
-	wget http://www.opengl.org/registry/api/wglext.h
-
 BUILT_SOURCES = generated_gl_wrappers.c generated_wgl_wrappers.c
 CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = wglext.h
 
-EXTRA_DIST = gen_gl_wrappers.py wglext.h
+EXTRA_DIST = gen_gl_wrappers.py
diff --git a/hw/xwin/glx/wgl_ext_api.c b/hw/xwin/glx/wgl_ext_api.c
index 4b8359f..1020916 100644
--- a/hw/xwin/glx/wgl_ext_api.c
+++ b/hw/xwin/glx/wgl_ext_api.c
@@ -35,7 +35,7 @@
 #include <GL/glext.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
-#include "wglext.h"
+#include <GL/wglext.h>
 #include <wgl_ext_api.h>
 #include "glwindows.h"
 
diff --git a/hw/xwin/glx/wgl_ext_api.h b/hw/xwin/glx/wgl_ext_api.h
index e4462ac..77efd70 100644
--- a/hw/xwin/glx/wgl_ext_api.h
+++ b/hw/xwin/glx/wgl_ext_api.h
@@ -29,7 +29,7 @@
 #ifndef wgl_ext_api_h
 #define wgl_ext_api_h
 
-#include "wglext.h"
+#include <GL/wglext.h>
 
 void wglResolveExtensionProcs(void);
 
-- 
1.7.4