xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xwin/Makefile.am     |    1 -
 hw/xwin/glx/Makefile.am |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5a7275d78a2f1c20ed5bb7b228cf370c4ada22c9
Author: Keith Packard <keithp at keithp.com>
Date:   Thu May 20 13:57:02 2010 -0700

    Find windows GL wrapper files in $(srcdir) instead of .
    
    This fixes 'make distcheck' for me.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
index 7fc1694..e9fea50 100644
--- a/hw/xwin/glx/Makefile.am
+++ b/hw/xwin/glx/Makefile.am
@@ -45,10 +45,10 @@ wgl.tm:
 	wget http://www.opengl.org/registry/api/wgl.tm
 
 generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm
-	./gen_gl_wrappers.py --spec=gl.spec --typemap=gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c
+	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/gl.spec --typemap=$(srcdir)/gl.tm --dispatch-header=$(top_srcdir)/glx/dispatch.h --staticwrappers >generated_gl_wrappers.c
 
 generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm
-	./gen_gl_wrappers.py --spec=wglext.spec --typemap=wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
+	$(srcdir)/gen_gl_wrappers.py --spec=$(srcdir)/wglext.spec --typemap=$(srcdir)/wgl.tm --prefix=wgl --preresolve >generated_wgl_wrappers.c
 
 wglext.h:
 	wget http://www.opengl.org/registry/api/wglext.h
commit 1197a87b5638037cc48084fba4eec9d3b599e900
Author: Keith Packard <keithp at keithp.com>
Date:   Thu May 20 13:40:24 2010 -0700

    winpriv.h was moved from hw/xwin to hw/xwin/glx in November
    
    hw/xwin/Makefile.am was referencing this instead of hw/xwin/glx/Makefile.am
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 7544cd3..03cb808 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -117,7 +117,6 @@ SRCS =	InitInput.c \
 	winms.h \
 	winmultiwindowclass.h \
 	winprefs.h \
-	winpriv.h \
 	winresource.h \
 	winwindow.h \
 	XWin.rc \
diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
index aadd442..7fc1694 100644
--- a/hw/xwin/glx/Makefile.am
+++ b/hw/xwin/glx/Makefile.am
@@ -2,6 +2,7 @@ noinst_LTLIBRARIES = libXwinGLX.la
 
 libXwinGLX_la_SOURCES = \
 	winpriv.c \
+	winpriv.h \
 	glwindows.h \
 	glwrap.c \
 	indirect.c \