diff options
| author | Eric Anholt <eric@anholt.net> | 2008-10-06 17:00:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-10-06 17:26:43 -0700 |
| commit | 3a4151b69daa478ac6edf042d604ee41e8429c0d (patch) | |
| tree | fff1ba0ece972c7b593a01ae7f3bc9681d63aae5 /src/Makefile.am | |
| parent | 3621183cf4acef23414e8d69c34b1e587f52ec67 (diff) | |
Fix driver build against server 1.4.2.
This disables UXA and DRM modesetting pre-1.5, due to privates handling
issues.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8966bd68..9b322151 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,14 +32,17 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER) AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ @PCIACCESS_CFLAGS@ @UXA_CFLAGS@ \ - @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA + @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_ladir = @moduledir@/drivers -intel_drv_la_LIBADD = -lm ../uxa/libuxa.la +intel_drv_la_LIBADD = -lm -ldrm_intel +if BUILD_UXA +intel_drv_la_LIBADD += ../uxa/libuxa.la +endif if XSERVER_LIBPCIACCESS -intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@ -ldrm_intel +intel_drv_la_LIBADD += @PCIACCESS_LIBS@ @DRM_LIBS@ endif XMODE_SRCS=\ |