From 403cb9e89fc9c82d7f1b21997e7deba6bc0fbcea Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Wed, 27 Feb 2008 18:45:21 +0200 Subject: drop radeon, theatre (build system). --- configure.ac | 74 -------------------------------------- man/Makefile.am | 4 +-- src/Makefile.am | 110 ++------------------------------------------------------ 3 files changed, 4 insertions(+), 184 deletions(-) diff --git a/configure.ac b/configure.ac index fe4c057..b244c55 100644 --- a/configure.ac +++ b/configure.ac @@ -62,11 +62,6 @@ AC_ARG_ENABLE(exa, [EXA="$enableval"], [EXA=yes]) -AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE], - [Path to X server source tree]), - [ XSERVER_SOURCE="$withval" ], - [ XSERVER_SOURCE="" ]) - # Checks for extensions XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) XORG_DRIVER_CHECK_EXT(RANDR, randrproto) @@ -112,16 +107,8 @@ if test "$DRI" = yes; then PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto]) AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) - if test "$have_damage_h" = yes; then - AC_DEFINE(DAMAGE,1,[Use Damage extension]) - fi fi -save_CFLAGS="$CFLAGS" -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, @@ -209,71 +196,10 @@ if test "x$have_exa_h" = xyes; then fi fi -AC_CHECK_DECL(xf86XVFillKeyHelperDrawable, - [AC_DEFINE(HAVE_XV_DRAWABLE_HELPER, 1, [Have xf86XVFillKeyHelperDrawable prototype])], - [], - [#include ]) - -AC_CHECK_DECL(xf86ModeBandwidth, - [AC_DEFINE(HAVE_XF86MODEBANDWIDTH, 1, [Have xf86ModeBandwidth prototype])], - [], - [#include "xorg-server.h" - #include "xf86Modes.h"]) - -AC_CHECK_DECL(xf86_crtc_clip_video_helper, - [AC_DEFINE(HAVE_XF86CRTCCLIPVIDEOHELPER, 1, [Have xf86_crtc_clip_video_helper prototype])], - [], - [#include - #include "xorg-server.h" - #include "xf86i2c.h" - #include "xf86Crtc.h"]) - AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) -AM_CONDITIONAL(XMODES, test "x$XMODES" = xno) - -if test "x$XSERVER_SOURCE" = x; then - if test -d ../../xserver; then - XSERVER_SOURCE="`cd ../../xserver && pwd`" - fi -fi - -if test -d "$XSERVER_SOURCE"; then - case "$XSERVER_SOURCE" in - /*) - ;; - *) - XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`" - esac - if test -f src/modes/xf86Modes.h; then - : - else - ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes - fi - - if test -f src/parser/xf86Parser.h; then - : - else - ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser - fi -fi -if test "x$XMODES" = xyes; then - AC_MSG_NOTICE([X server has new mode code]) - AC_DEFINE(XMODES, 1,[X server has built-in mode code]) - XMODES_CFLAGS= -else - if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then - AC_MSG_NOTICE([X server is missing new mode code, using local copy]) - else - AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source]) - fi - XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser' -fi - -AC_SUBST([XMODES_CFLAGS]) - CPPFLAGS="$SAVE_CPPFLAGS" AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes) diff --git a/man/Makefile.am b/man/Makefile.am index 2788428..c5347d0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -27,11 +27,11 @@ drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = @DRIVER_NAME@.man r128.man radeon.man +driverman_PRE = @DRIVER_NAME@.man r128.man driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = @DRIVER_NAME@.man r128.man radeon.man +EXTRA_DIST = @DRIVER_NAME@.man r128.man CLEANFILES = $(driverman_DATA) diff --git a/src/Makefile.am b/src/Makefile.am index e0799a5..e48bc68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,41 +29,8 @@ if DRI ATIMISC_DRI_SRCS = atidri.c R128_DRI_SRCS = r128_dri.c -RADEON_DRI_SRCS = radeon_dri.c endif -RADEON_ATOMBIOS_SOURCES = \ - AtomBios/CD_Operations.c \ - AtomBios/Decoder.c \ - AtomBios/hwserv_drv.c \ - AtomBios/includes/atombios.h \ - AtomBios/includes/CD_binding.h \ - AtomBios/includes/CD_Common_Types.h \ - AtomBios/includes/CD_Definitions.h \ - AtomBios/includes/CD_hw_services.h \ - AtomBios/includes/CD_Opcodes.h \ - AtomBios/includes/CD_Structs.h \ - AtomBios/includes/Decoder.h \ - AtomBios/includes/ObjectID.h \ - AtomBios/includes/regsdef.h - -XMODE_SRCS=\ - local_xf86Rename.h \ - parser/xf86Parser.h \ - parser/xf86Optrec.h \ - modes/xf86Modes.h \ - modes/xf86Modes.c \ - modes/xf86cvt.c \ - modes/xf86Crtc.h \ - modes/xf86Crtc.c \ - modes/xf86Cursors.c \ - modes/xf86EdidModes.c \ - modes/xf86RandR12.c \ - modes/xf86RandR12.h \ - modes/xf86Rename.h \ - modes/xf86Rotate.c \ - modes/xf86DiDGA.c - if ATIMISC_CPIO ATIMISC_CPIO_SOURCES = ativga.c ativgaio.c atibank.c atiwonder.c atiwonderio.c endif @@ -74,11 +41,9 @@ endif if USE_EXA ATIMISC_EXA_SOURCES = atimach64exa.c -RADEON_EXA_SOURCES = radeon_exa.c endif -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS -DATOM_BIOS -DATOM_BIOS_PARSER -DFGL_LINUX -DDRIVER_PARSER -INCLUDES = -I$(srcdir)/AtomBios/includes +AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ ati_drv_la_LTLIBRARIES = ati_drv.la ati_drv_la_LDFLAGS = -module -avoid-version @@ -106,50 +71,8 @@ r128_drv_la_SOURCES = \ r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \ r128_video.c r128_misc.c r128_probe.c $(R128_DRI_SRCS) -radeon_drv_la_LTLIBRARIES = radeon_drv.la -radeon_drv_la_LDFLAGS = -module -avoid-version -radeon_drv_ladir = @moduledir@/drivers -radeon_drv_la_SOURCES = \ - radeon_accel.c radeon_cursor.c radeon_dga.c \ - radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \ - radeon_vip.c radeon_misc.c radeon_probe.c \ - legacy_crtc.c legacy_output.c \ - radeon_textured_video.c \ - radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \ - $(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \ - $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c - -if XMODES -radeon_drv_la_SOURCES += \ - $(XMODE_SRCS) -endif - -theatre_detect_drv_la_LTLIBRARIES = theatre_detect_drv.la -theatre_detect_drv_la_LDFLAGS = -module -avoid-version -theatre_detect_drv_ladir = @moduledir@/multimedia -theatre_detect_drv_la_SOURCES = \ - theatre_detect.c theatre_detect_module.c - -theatre_drv_la_LTLIBRARIES = theatre_drv.la -theatre_drv_la_LDFLAGS = -module -avoid-version -theatre_drv_ladir = @moduledir@/multimedia - -theatre_drv_la_SOURCES = \ - theatre.c theatre_module.c - -theatre200_drv_la_LTLIBRARIES = theatre200_drv.la -theatre200_drv_la_LDFLAGS = -module -avoid-version -theatre200_drv_ladir = @moduledir@/multimedia -theatre200_drv_la_CFLAGS = \ - $(AM_CFLAGS) -DMICROC_DIR=\"$(theatre200_drv_ladir)\" -theatre200_drv_la_SOURCES = \ - theatre200.c theatre200_module.c - EXTRA_DIST = \ - $(XMODE_SRCS) \ atimach64render.c \ - radeon_render.c \ - radeon_accelfuncs.c \ \ atiadjust.h \ atiaudio.h \ @@ -196,7 +119,6 @@ EXTRA_DIST = \ atiwonder.h \ atiwonderio.h \ atixv.h \ - generic_bus.h \ mach64_common.h \ mach64_dri.h \ mach64_sarea.h \ @@ -208,32 +130,4 @@ EXTRA_DIST = \ r128_reg.h \ r128_sarea.h \ r128_version.h \ - radeon_common.h \ - radeon_commonfuncs.c \ - radeon_dri.h \ - radeon_dripriv.h \ - radeon_exa_render.c \ - radeon_exa_funcs.c \ - radeon.h \ - radeon_macros.h \ - radeon_probe.h \ - radeon_reg.h \ - radeon_sarea.h \ - radeon_version.h \ - radeon_video.h \ - radeon_tv.h \ - radeon_atomwrapper.h \ - theatre200.h \ - theatre_detect.h \ - theatre.h \ - theatre_reg.h \ - atipciids.h \ - atipcirename.h \ - ati_pciids_gen.h \ - radeon_chipinfo_gen.h \ - radeon_chipset_gen.h \ - radeon_pci_chipset_gen.h \ - radeon_pci_device_match_gen.h \ - pcidb/ati_pciids.csv \ - pcidb/parse_pci_ids.pl \ - radeon_atombios.h + atipcirename.h -- cgit v1.2.3