diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-17 11:15:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-17 21:26:34 +0000 |
| commit | a8fe50ab6503d9cb63931771318dc3e84d002092 (patch) | |
| tree | 68b704d8590de6330a26d13cdcafad71e788438d /src/Makefile.am | |
| parent | 3320b459d6fe90d1145e3874c840b95279fb16c8 (diff) | |
uxa: Explicitly check for libdrm_intel in configure
And remove the excess dependencies from the common files.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index afaed360..62ac04f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,8 +26,7 @@ SUBDIRS = xvmc render_program legacy # _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 = @CWARNFLAGS@ @XORG_CFLAGS@ @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ - @PCIACCESS_CFLAGS@ +AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@ intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version @@ -46,8 +45,9 @@ intel_drv_la_SOURCES = \ $(NULL) if UXA +AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@ AM_CFLAGS += -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program -intel_drv_la_LIBADD += @UDEV_LIBS@ @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la +intel_drv_la_LIBADD += @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@ ../uxa/libuxa.la intel_drv_la_SOURCES += \ brw_defines.h \ brw_structs.h \ |