diff options
| author | Evgeny M. Zubok <zoubok@mail.ru> | 2006-11-25 23:35:28 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@t41p.(none)> | 2006-11-25 23:35:28 -0500 |
| commit | d4ce4d3f91690a61511b2d13943e5d0073917377 (patch) | |
| tree | 36ad83839755db2693252654aa30b51325f767b0 | |
| parent | 1f2426bf8aad082f6f232d3b8c497acdd9892810 (diff) | |
full fix for older cards.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1467286..ad77db3 100644 --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,6 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC -AC_DEFINE(S3_NEWMMIO, 1, [Enable support for the new MMIO]) - AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/Makefile.am b/src/Makefile.am index cddf0cb..ddbb6f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,6 @@ s3_drv_ladir = @moduledir@/drivers s3_drv_la_SOURCES = \ newmmio.h \ - s3_accel.c \ s3_bios.c \ s3_cursor.c \ s3_dga.c \ @@ -41,3 +40,12 @@ s3_drv_la_SOURCES = \ s3_Ti.c \ s3_Trio64DAC.c \ s3_video.c + +noinst_LTLIBRARIES = libs3_accel_newmmio.la libs3_accel_pio.la +s3_drv_la_LIBADD = libs3_accel_newmmio.la libs3_accel_pio.la + +libs3_accel_newmmio_la_SOURCES = s3_accel.c +libs3_accel_newmmio_la_CFLAGS = $(AM_CFLAGS) -DS3_NEWMMIO=1 + +libs3_accel_pio_la_SOURCES = s3_accel.c +libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS) |