xf86-video-intel: Branch 'xf86-video-intel-2.5-branch' - src/Makefile.am

Jesse Barnes jbarnes at kemper.freedesktop.org
Thu Nov 13 12:37:42 PST 2008


 src/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d2bf2742eca175a9c92fe939ddb202f63594af1
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Thu Nov 13 12:35:02 2008 -0800

    Make sure DRM library paths are included
    
    We need @DRM_LIBS@ in order to find drm_intel if installed in a
    non-standard path.

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b32215..232ac53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,12 +37,12 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = -lm -ldrm_intel
+intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel
 if BUILD_UXA
 intel_drv_la_LIBADD += ../uxa/libuxa.la
 endif
 if XSERVER_LIBPCIACCESS
-intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@
+intel_drv_la_LIBADD += @PCIACCESS_LIBS@
 endif
 
 XMODE_SRCS=\


More information about the xorg-commit mailing list