From 6d601de15fadaf3b336d606db881e4531a26d123 Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Wed, 27 Feb 2008 19:07:00 +0200 Subject: [PATCH] drop mach64 (build system) --- Makefile.am | 5 +-- configure.ac | 92 ------------------------------------------------- src/Makefile.am | 75 ---------------------------------------- 3 files changed, 1 insertion(+), 171 deletions(-) diff --git a/Makefile.am b/Makefile.am index ea2e4a3..c8dcab8 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 b244c55..06bf473 100644 --- a/configure.ac +++ b/configure.ac @@ -56,12 +56,6 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], [DRI="$enableval"], [DRI=auto]) -AC_ARG_ENABLE(exa, - AC_HELP_STRING([--disable-exa], - [Disable EXA support [[default=enabled]]]), - [EXA="$enableval"], - [EXA=yes]) - # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -109,97 +103,11 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi -# 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. -AC_MSG_CHECKING([whether to enable EXA support]) -if test "x$EXA" = xyes; then - AC_MSG_RESULT(yes) - - SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" - AC_CHECK_HEADER(exa.h, - [have_exa_h="yes"], [have_exa_h="no"]) - CPPFLAGS="$SAVE_CPPFLAGS" -else - AC_MSG_RESULT(no) -fi - SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" -if test "x$have_exa_h" = xyes; then - AC_MSG_CHECKING([whether EXA version is at least 2.0.0]) - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -#include "exa.h" -#if EXA_VERSION_MAJOR < 2 -#error OLD EXA! -#endif - ]])], - [USE_EXA=yes], - [USE_EXA=no]) - AC_MSG_RESULT($USE_EXA) - - if test "x$USE_EXA" = xyes; then - AC_DEFINE(USE_EXA, 1, [Build support for Exa]) - fi -fi - AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes) diff --git a/src/Makefile.am b/src/Makefile.am index 4341302..df7c65c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,37 +27,11 @@ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. if DRI -ATIMISC_DRI_SRCS = atidri.c R128_DRI_SRCS = r128_dri.c endif -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 -endif - AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -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 @@ -66,55 +40,6 @@ r128_drv_la_SOURCES = \ r128_video.c r128_misc.c r128_probe.c $(R128_DRI_SRCS) EXTRA_DIST = \ - atimach64render.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 \ - ativga.h \ - ativgaio.h \ - atividmem.h \ - atiwonder.h \ - atiwonderio.h \ - atixv.h \ - mach64_common.h \ - mach64_dri.h \ - mach64_sarea.h \ r128_common.h \ r128_dri.h \ r128_dripriv.h \