diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 52 | ||||
| -rw-r--r-- | src/Makefile.am | 70 |
3 files changed, 1 insertions, 126 deletions
diff --git a/Makefile.am b/Makefile.am index ea2e4a37..c8dcab88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,15 +22,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man if BUILD_LINUXDOC -README.ati: README.ati.sgml - $(MAKE_TEXT) README.ati.sgml && mv README.ati.txt README.ati - README.r128: README.r128.sgml $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128 endif -EXTRA_DIST = README.ati README.r128 README.ati.sgml README.r128.sgml ChangeLog +EXTRA_DIST = README.r128 README.r128.sgml ChangeLog CLEANFILES = ChangeLog .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index fe4c0579..560b935c 100644 --- a/configure.ac +++ b/configure.ac @@ -122,58 +122,6 @@ CFLAGS="$XORG_CFLAGS" AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"]) CFLAGS="$save_CFLAGS" -# Note that this is sort of inverted from drivers/ati/Imakefile in -# the monolith. We test for foo, not for !foo (i.e. ATMISC_CPIO, not -# ATIMISC_AVOID_CPIO), but the defines are negative. So beware. Oh yeah, -# TV_OUT is the special case where it's a positive define, not AVOID_TV_OUT. - -# AVOID_CPIO: Only x86, amd64, and alpha are cool with CPIO. It needs a -# little-endian, undirected PIO space of at least 64kB. -# AVOID_DGA: ??? -# ATI_TV_OUT: This only works on x86. - -ATIMISC_CPIO=no -ATIMISC_DGA=yes -ATIMISC_TV_OUT=no - -case $host_cpu in - i*86) - ATIMISC_TV_OUT=yes - ATIMISC_CPIO=yes - ;; - x86_64|amd64|alpha|ia64) - ATIMISC_CPIO=yes - ;; - sparc) - ATIMISC_DGA=no - ;; - *) - ;; -esac - -AC_MSG_CHECKING([whether to include PIO support]) -AM_CONDITIONAL(ATIMISC_CPIO, test "x$ATIMISC_CPIO" = xyes) -if test "x$ATIMISC_CPIO" = xyes; then - AC_MSG_RESULT([yes, PIO]) -else - AC_DEFINE(AVOID_CPIO, 1, [Avoid PIO and use MMIO for atimisc.]) - AC_MSG_RESULT([no, MMIO]) -fi - -AC_MSG_CHECKING([whether to include DGA support]) -AC_MSG_RESULT([$ATIMISC_DGA]) -AM_CONDITIONAL(ATIMISC_DGA, test "x$ATIMISC_DGA" = xyes) -if ! test "x$ATIMISC_DGA" = xyes; then - AC_DEFINE(AVOID_DGA, 1, [Do not build DGA support.]) -fi - -AC_MSG_CHECKING([whether to include TV Out support]) -AC_MSG_RESULT([$ATIMISC_TV_OUT]) -AM_CONDITIONAL(ATIMISC_TV_OUT, test "x$ATIMISC_TV_OUT" = xyes) -if test "x$ATIMISC_TV_OUT" = xyes; then - AC_DEFINE(TV_OUT, 1, [Build TV-Out support for atimisc.]) -fi - AC_DEFINE(USE_XAA, 1, [Build support for XAA]) # Properly handle EXA. diff --git a/src/Makefile.am b/src/Makefile.am index e0799a56..0ea606db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,6 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. if DRI -ATIMISC_DRI_SRCS = atidri.c R128_DRI_SRCS = r128_dri.c RADEON_DRI_SRCS = radeon_dri.c endif @@ -64,16 +63,7 @@ XMODE_SRCS=\ modes/xf86Rotate.c \ modes/xf86DiDGA.c -if ATIMISC_CPIO -ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c -endif - -if ATIMISC_DGA -ATIMISC_DGA_SOURCES = atidga.c -endif - if USE_EXA -ATIMISC_EXA_SOURCES = atimach64exa.c RADEON_EXA_SOURCES = radeon_exa.c endif @@ -86,19 +76,6 @@ ati_drv_ladir = @moduledir@/drivers ati_drv_la_SOURCES = \ ati.c atimodule.c -mach64_drv_la_LTLIBRARIES = mach64_drv.la -mach64_drv_la_LDFLAGS = -module -avoid-version -mach64_drv_ladir = @moduledir@/drivers -mach64_drv_la_SOURCES = \ - atibus.c atichip.c atiprobe.c atividmem.c \ - atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \ - atidac.c atidecoder.c atidsp.c atii2c.c \ - atilock.c atimach64.c atimach64accel.c atimach64cursor.c \ - atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \ - atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \ - atiload.c atimisc.c atimach64probe.c $(ATIMISC_CPIO_SOURCES) \ - $(ATIMISC_DGA_SOURCES) $(ATIMISC_DRI_SRCS) $(ATIMISC_EXA_SOURCES) - r128_drv_la_LTLIBRARIES = r128_drv.la r128_drv_la_LDFLAGS = -module -avoid-version r128_drv_ladir = @moduledir@/drivers @@ -147,59 +124,12 @@ theatre200_drv_la_SOURCES = \ EXTRA_DIST = \ $(XMODE_SRCS) \ - atimach64render.c \ radeon_render.c \ radeon_accelfuncs.c \ \ - atiadjust.h \ - atiaudio.h \ - atibank.h \ - atibus.h \ - atichip.h \ - aticlock.h \ - aticonsole.h \ - aticrtc.h \ - aticursor.h \ - atidac.h \ - atidecoder.h \ - atidga.h \ - atidri.h \ - atidripriv.h \ - atidsp.h \ ati.h \ - atii2c.h \ - atiload.h \ - atilock.h \ - atimach64accel.h \ - atimach64.h \ - atimach64i2c.h \ - atimach64io.h \ - atimach64probe.h \ - atimach64version.h \ - atimode.h \ - atioption.h \ - atipreinit.h \ - atiprint.h \ - atipriv.h \ - atiprobe.h \ - atiregs.h \ - atirgb514.h \ - atiscreen.h \ - atistruct.h \ - atituner.h \ - atiutil.h \ - ativalid.h \ ativersion.h \ - ativga.h \ - ativgaio.h \ - atividmem.h \ - atiwonder.h \ - atiwonderio.h \ - atixv.h \ generic_bus.h \ - mach64_common.h \ - mach64_dri.h \ - mach64_sarea.h \ r128_common.h \ r128_dri.h \ r128_dripriv.h \ |