diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-01-13 17:14:47 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2012-01-13 17:32:11 +0100 |
| commit | c5af120177949c82cbd0611da565fef9c2c829cb (patch) | |
| tree | a3cfcda31e3b0b77d3cebf03ee6e1ecb3c957e7e | |
| parent | e6d03aceb1195de0b490f39024f34a33b1a8f6fc (diff) | |
Make the driver build pass "make distcheck"
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vmwgfx/Makefile.am | 7 | ||||
| -rw-r--r-- | vmwgfx/vmwgfx_driver.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3aec9af..0749a76 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,7 @@ if test x$BUILD_VMWGFX = xyes; then AC_MSG_RESULT([yes]) AC_SYS_LARGEFILE VMWGFX_DIRS="saa vmwgfx" - VMWGFX_LIBADD='$(top_srcdir)/vmwgfx/libvmwgfx.la' + VMWGFX_LIBADD='$(top_builddir)/vmwgfx/libvmwgfx.la' AC_CONFIG_FILES([ saa/Makefile vmwgfx/Makefile diff --git a/vmwgfx/Makefile.am b/vmwgfx/Makefile.am index 1ee6582..813f1a2 100644 --- a/vmwgfx/Makefile.am +++ b/vmwgfx/Makefile.am @@ -1,18 +1,21 @@ noinst_LTLIBRARIES = libvmwgfx.la libvmwgfx_la_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) @LIBDRM_CFLAGS@ @XATRACKER_CFLAGS@ -I$(top_srcdir)/src -I$(top_srcdir)/saa -libvmwgfx_la_LIBADD = @LIBDRM_LIBS@ $(top_srcdir)/saa/libsaa.la\ +libvmwgfx_la_LIBADD = @LIBDRM_LIBS@ $(top_builddir)/saa/libsaa.la\ @XATRACKER_LIBS@ -libvmwgfx_la_DEPENDENCIES = $(top_srcdir)/saa/libsaa.la +libvmwgfx_la_DEPENDENCIES = $(top_builddir)/saa/libsaa.la libvmwgfx_la_SOURCES = \ + svga3d_reg.h \ vmwgfx_driver.c \ vmwgfx_driver.h \ + vmwgfx_drm.h \ vmwgfx_crtc.c \ vmwgfx_output.c \ vmwgfx_dri2.c \ vmwgfx_tex_video.c \ vmwgfx_saa.c \ vmwgfx_saa.h \ + vmwgfx_saa_priv.h \ vmwgfx_drmi.c \ vmwgfx_drmi.h \ vmwgfx_overlay.c \ diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index 9baf01c..c5487e2 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -76,7 +76,7 @@ typedef uint16_t uint16; typedef int8_t int8; typedef uint8_t uint8; -#include "./src/svga_reg.h" +#include "../src/svga_reg.h" #define XA_VERSION_MINOR_REQUIRED 0 #define XA_VERSION_MAJOR_REQUIRED 1 |