xf86-video-intel: Branch 'modesetting' - src/ch7xxx/Makefile.am src/sil164/Makefile.am

Eric Anholt anholt at kemper.freedesktop.org
Tue Dec 19 19:50:16 EET 2006


 src/ch7xxx/Makefile.am |    2 +-
 src/sil164/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 3b5703c7fa08e63f2a31be7496ded9c70015946d (from d89e211b12ff715d7475421af69157b102accaca)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Tue Dec 19 09:49:49 2006 -0800

    Respect the srcdir.

diff --git a/src/ch7xxx/Makefile.am b/src/ch7xxx/Makefile.am
index d63c7fc..7f3b1e1 100644
--- a/src/ch7xxx/Makefile.am
+++ b/src/ch7xxx/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I../
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/../
 
 ch7xxx_la_LTLIBRARIES = ch7xxx.la
 ch7xxx_la_LDFLAGS = -module -avoid-version
diff --git a/src/sil164/Makefile.am b/src/sil164/Makefile.am
index d4c0cbd..927f5a7 100644
--- a/src/sil164/Makefile.am
+++ b/src/sil164/Makefile.am
@@ -3,7 +3,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I../
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/../
 
 sil164_la_LTLIBRARIES = sil164.la
 sil164_la_LDFLAGS = -module -avoid-version



More information about the xorg-commit mailing list