xf86-video-intel: 2 commits - src/Makefile.am

[Julien Cristau]

 src/Makefile.am |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8ac00ca97995e36514ff593fec3c0f0d316ed138
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Jun 6 13:40:20 2008 +0200

    Link the driver with -lpciaccess and -ldrm if needed
    
    This makes sure the driver ends up with a DT_NEEDED reference to
    the libraries it's using.

diff --git a/src/Makefile.am b/src/Makefile.am
index 45f8b19..1e4ad28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,10 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
+intel_drv_la_LIBADD =
+if XSERVER_LIBPCIACCESS
+intel_drv_la_LIBADD += @PCIACCESS_LIBS@
+endif
 
 XMODE_SRCS=\
 	 local_xf86Rename.h \
@@ -203,6 +207,8 @@ endif
 if DRI
 intel_drv_la_SOURCES += \
 	$(INTEL_DRI_SRCS)
+intel_drv_la_LIBADD += \
+	$(DRI_LIBS)
 endif
 
 if XVMC
commit d61182511b1520b04133d28480e1ffaacbaeb753
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Jul 6 12:00:52 2008 +0200

    Fix gen4asm rule to work with a build dir

diff --git a/src/Makefile.am b/src/Makefile.am
index 9dd9b37..45f8b19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -185,7 +185,7 @@ if HAVE_GEN4ASM
 
 SUFFIXES = .g4a .g4b
 .g4a.g4b:
-	m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
+	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
 
 $(INTEL_G4B): $(INTEL_G4I)