From 2eab094816726542c4de6c9db5efa102ab1e1593 Mon Sep 17 00:00:00 2001
From: David Reveman <c99drn@cs.umu.se>
Date: Mon, 13 Jun 2005 16:38:06 +0000
Subject: [PATCH] Build fixes

---
 hw/kdrive/epson/Makefile.am |  6 +++++-
 hw/kdrive/i810/Makefile.am  |  2 +-
 hw/xgl/Makefile.am          | 11 ++++++++++-
 hw/xgl/egl/Makefile.am      | 20 +++++++++++++-------
 hw/xgl/xglpict.c            |  5 +----
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am
index 726ae6aa4..a4ec2706a 100644
--- a/hw/kdrive/epson/Makefile.am
+++ b/hw/kdrive/epson/Makefile.am
@@ -12,7 +12,11 @@ noinst_LIBRARIES = libepson.a
 
 libepson_a_SOURCES = 	\
 	epson13806.c	\
-	epson13806draw.c
+	epson13806.h	\
+	epson13806draw.c\
+	epson13806draw.h\
+	epson13806reg.h
+
 Xepson_SOURCES = \
 	epson13806stub.c
 
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index 673351c57..da6d0801b 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -15,7 +15,7 @@ libi810_a_SOURCES = 		\
 	i810_video.c	\
 	i810draw.c	\
 	i810draw.h	\
-	i810reg.h	\
+	i810_reg.h	\
 	i810.c		\
 	i810.h
 
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index 2f30bd0c4..0228c0d0a 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = . $(XGLX_DIRS) $(XEGL_DIRS)
+if XGLXSERVER
+XGLX_SUBDIRS = glx
+endif
+
+if XEGLSERVER
+XEGL_SUBDIRS = egl
+endif
+
+SUBDIRS = . $(XGLX_SUBDIRS) $(XEGL_SUBDIRS)
 
 INCLUDES =		   \
 	@XGL_INCS@	   \
@@ -8,6 +16,7 @@ INCLUDES =		   \
 noinst_LIBRARIES = libxgl.a
 
 libxgl_a_SOURCES =     \
+	xgl.h	       \
 	xglinput.c     \
 	xgloutput.c    \
 	xglcmap.c      \
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index d08bd8d21..d51b8bc90 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -1,16 +1,22 @@
 INCLUDES =		    \
 	@XGL_INCS@	    \
-	@XSERVER_CFLAGS@
+	@XSERVER_CFLAGS@    \
+	@XGLXSERVER_CFLAGS@
 
 bin_PROGRAMS = Xegl
 
-Xegl_SOURCES = xegl.c xeglinput.c kinput.c evdev.c
+Xegl_SOURCES =	    \
+	xegl.h	    \
+	xegl.c	    \
+	xeglinput.c \
+	kkeymap.h   \
+	kinput.c    \
+	evdev.c
 
-Xegl_LDADD =	          \
-	@XGL_LIBS@        \
-	@XEGL_LIBS@       \
-	@XEGLSERVER_LIBS@ \
-	@XSERVER_LIBS@
+Xegl_LDADD =		  \
+	@XGL_LIBS@	  \
+	@XSERVER_LIBS@	  \
+	@XEGLSERVER_LIBS@
 
 Xegl_DEPENDENCIES = @XGL_LIBS@
 
diff --git a/hw/xgl/xglpict.c b/hw/xgl/xglpict.c
index ec79eda68..62004f0c6 100644
--- a/hw/xgl/xglpict.c
+++ b/hw/xgl/xglpict.c
@@ -456,10 +456,7 @@ xglPictureInit (ScreenPtr pScreen)
     if (!fbPictureInit (pScreen, pFormats, nformats))
 	return FALSE;
 
-    if (PictureAddFilter (pScreen,
-			  FilterConvolution,
-			  miFilterValidateParams) < 0)
-	return FALSE;
+    PictureAddFilter (pScreen, FilterConvolution, miFilterValidateParams);
     
     return TRUE;
 }