diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-07-23 13:28:42 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-07-28 16:20:32 -0400 |
| commit | f9d6c0de231357f96e2e0de71e6c9221bcb36bd4 (patch) | |
| tree | 16a6efe8ab5e7296c492b139f10f496736da193c /src/Makefile.am | |
| parent | 0028419acb0762eeb950de5fe702c93e70301612 (diff) | |
The local copy of the modes code is no longer required.
The server 1.2 as shipped in the tarball on the web does not contain the
modes code. It was added just after and found in git branch server-1.2-branch.
The modes code was initially included in version ati 6.8.0 and fails to compile
with server 1.2 as it requires randr 1.2. The modes code is included in server
versions 1.3 and later, so there is no need to provide an unknown version of
the modes code in the ati driver tarball. It will never be used.
This patch makes the ati driver requiring server 1.3 or later.
Version 6.8.0 configures and builds ok on server 1.3
Master branch post 6.13.1 configures and builds ok on server 1.3
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0ce46b08..5750770e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,23 +48,6 @@ RADEON_ATOMBIOS_SOURCES = \ 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 XF86DRM_MODE RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c endif @@ -77,7 +60,6 @@ AM_CFLAGS = \ @LIBDRM_RADEON_CFLAGS@ \ @XORG_CFLAGS@ \ @DRI_CFLAGS@ \ - @XMODES_CFLAGS@ \ @LIBUDEV_CFLAGS@ \ -DDISABLE_EASF \ -DENABLE_ALL_SERVICE_FUNCTIONS \ @@ -116,11 +98,6 @@ radeon_drv_la_SOURCES = \ $(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c \ $(RADEON_KMS_SRCS) -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 @@ -143,7 +120,6 @@ theatre200_drv_la_SOURCES = \ theatre200.c theatre200_module.c EXTRA_DIST = \ - $(XMODE_SRCS) \ radeon_render.c \ radeon_accelfuncs.c \ radeon_textured_videofuncs.c \ |