diff options
| author | David Reveman <c99drn@cs.umu.se> | 2005-06-13 16:38:06 +0000 |
|---|---|---|
| committer | David Reveman <c99drn@cs.umu.se> | 2005-06-13 16:38:06 +0000 |
| commit | 2eab094816726542c4de6c9db5efa102ab1e1593 (patch) | |
| tree | 2e2126f05d114b726849a67c978f6a6583d06dfa /hw/xgl | |
| parent | 49476ca73c86a599a1bc49cba1117d42f59996a8 (diff) | |
Build fixes
Diffstat (limited to 'hw/xgl')
| -rw-r--r-- | hw/xgl/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/xgl/egl/Makefile.am | 20 | ||||
| -rw-r--r-- | hw/xgl/xglpict.c | 5 |
3 files changed, 24 insertions, 12 deletions
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; } |