diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 14 |
3 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2005-12-14 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/Makefile.am: + Bug #4890: Include the assembly in the build (Ferris McCormick) + 2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> * man/Makefile.am: diff --git a/configure.ac b/configure.ac index ffb69ce..5eee4b4 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,12 @@ AM_MAINTAINER_MODE # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL +case $host_cpu in + sparc*) + CCASFLAGS="-x assembler-with-cpp -Wa,-Av9a" + SPARC=yes +esac +AM_PROG_AS AC_PROG_CC AH_TOP([#include "xorg-server.h"]) @@ -94,6 +100,8 @@ if test "$DRI" = yes; then AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) fi +AM_CONDITIONAL(SPARC, test x$SPARC = xyes) + AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/Makefile.am b/src/Makefile.am index 08f84e8..7a908f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,10 @@ sunffb_drv_la_LTLIBRARIES = sunffb_drv.la sunffb_drv_la_LDFLAGS = -module -avoid-version sunffb_drv_ladir = @moduledir@/drivers +if SPARC +SPARC_ASM_SRC = ffb_asm.s VISmoveImage.s +endif + sunffb_drv_la_SOURCES = \ ffb_accel.c \ ffb_attr.c \ @@ -62,7 +66,8 @@ sunffb_drv_la_SOURCES = \ ffb_stip.h \ ffb_stubs.c \ ffb_wid.c \ - ffb_zeroarc.c + ffb_zeroarc.c \ + $(SPARC_ASM_SRC) if DRI sunffb_drv_la_SOURCES += \ @@ -70,13 +75,8 @@ sunffb_drv_la_SOURCES += \ ffb_drishare.h endif -# The two assembly language files here could conceivably be -# resurrected by someone sufficiently motivated. - EXTRA_DIST = \ ffb_clip.c \ ffb_clip.h \ ffb_wline.c \ - ffb_rect.c \ - ffb_asm.s \ - VISmoveImage.s + ffb_rect.c |