xf86-video-intel: src/legacy/i810 src/legacy/Makefile.am src/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Mon Jun 28 09:45:09 PDT 2010
src/Makefile.am | 1 +
src/legacy/Makefile.am | 2 +-
src/legacy/i810/Makefile.am | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 17884af4eda01c05e7429ed6a195f3e4ceeff892
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jun 28 17:44:45 2010 +0100
Repair the damage to 'make distcheck' after splitting out i810
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/Makefile.am b/src/Makefile.am
index dfc55ef..fbccf0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,7 @@ intel_drv_la_SOURCES = \
intel.h \
intel_module.c \
intel_driver.c \
+ intel_driver.h \
intel_batchbuffer.c \
intel_batchbuffer.h \
intel_memory.c \
diff --git a/src/legacy/Makefile.am b/src/legacy/Makefile.am
index af10c01..206ac9c 100644
--- a/src/legacy/Makefile.am
+++ b/src/legacy/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liblegacy.la
NULL:=#
-liblegacy_la_SOURCES =
+liblegacy_la_SOURCES = legacy.h
liblegacy_la_LIBADD =
if ! KMS_ONLY
diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index aab7f51..3676da6 100644
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -2,7 +2,10 @@ SUBDIRS = xvmc
noinst_LTLIBRARIES = liblegacy-i810.la
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ -I$(top_srcdir)/src
+AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/legacy \
+ $(NULL)
liblegacy_i810_la_SOURCES = \
i810_accel.c \
@@ -27,7 +30,6 @@ endif
if XVMC
liblegacy_i810_la_SOURCES += \
- i810_hwmc.h \
i810_hwmc.c \
$(NULL)
endif
More information about the xorg-commit
mailing list