Sorry for my previous dirty hack for Makefile.am. My previous message
should be ignored. Now I present new correct version of patch. It also
possibly closes bug #377386 which was merged with this bug.
Infomation for maintainer. This patch replaces(!!!) my previous patch
01_enable_new_mmio.diff. It should be applied against /src/Makefile.am.
And then './autogen.sh'. The old patch should be removed from /debian
dir (also remove line
AC_DEFINE(S3_NEWMMIO, 1, [Enable support for the new MMIO] from
configure.ac which the 01_enable_new_mmio.diff inserts).
Patchfile against /src/Makefile.am
--- orig/src/Makefile.am 2006-11-24 22:49:28.000000000 +0000
+++ new/src/Makefile.am 2006-11-24 22:51:19.000000000 +0000
@@ -30,7 +30,6 @@
s3_drv_la_SOURCES = \
newmmio.h \
- s3_accel.c \
s3_bios.c \
s3_cursor.c \
s3_dga.c \
@@ -41,3 +40,12 @@
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)
