diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-03 17:04:45 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-12-03 17:04:45 +0000 |
| commit | 26f9c4305660c2b3dc7fe8d214bcdd3c24e1b198 (patch) | |
| tree | 755dd8493d0a89c8184a1ad5690b95e51300366f | |
| parent | 98231c6b38c98976f4ac2b9417ecfbc37a8cbe9a (diff) | |
Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
and cfb24 only need to be built on sparc
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 7 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 7 |
5 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2005-12-03 Alan Coopersmith <alan.coopersmith@sun.com> + + * xorg/Makefile.am: + * xorg/configure.ac: + * xorg/hw/xfree86/Makefile.am: + * hw/xfree86/dixmods/Makefile.am: + Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> + Patch #3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> + xf8_32wid and cfb24 only need to be built on sparc + 2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 252d99b21..516bad49e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,10 @@ endif if CFB CFB_DIR=cfb CFB16_DIR=cfb16 +# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC +if BUILD_XF8_32WID CFB24_DIR=cfb24 +endif CFB32_DIR=cfb32 endif diff --git a/configure.ac b/configure.ac index 3dbd4b6fd..987381439 100644 --- a/configure.ac +++ b/configure.ac @@ -167,6 +167,7 @@ dnl hw/xfree86/os-support/bus/Makefile.am, among others. dnl --------------------------------------------------------------------------- DEFAULT_INT10="x86emu" use_x86_asm="no" +build_xf8_32wid="no" dnl Override defaults as needed for specific platforms: @@ -197,6 +198,7 @@ case $host_cpu in esac ;; sparc*) + build_xf8_32wid="yes" # used by sunffb driver xorg_loader_sparcmuldiv="yes" SPARC64_VIDEO=yes BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" @@ -212,6 +214,7 @@ case $host_cpu in ;; esac +AM_CONDITIONAL(BUILD_XF8_32WID, [test x$build_xf8_32wid = xyes]) dnl BSD *_video.c selection AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 281498904..058015095 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -4,11 +4,14 @@ endif DOC_SUBDIR = doc +if BUILD_XF8_32WID +XF8_32WID_SUBDIR=xf8_32wid +endif SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ - xf8_32bpp xf8_32wid loader scanpci dixmods exa $(DRI_SUBDIR) utils \ - $(DOC_SUBDIR) getconfig + xf8_32bpp $(XF8_32WID_SUBDIR) loader scanpci dixmods exa \ + $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index dc7ee5092..1ed24fa94 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -10,10 +10,15 @@ if XTRAP XTRAPMOD = libxtrap.la endif +# cfb24 is only used by xf8_32wid, which is only used by sunffb on SPARC +if BUILD_XF8_32WID +CFB24MOD = libcfb24.la +endif + module_LTLIBRARIES = libafb.la \ libcfb.la \ libcfb16.la \ - libcfb24.la \ + $(CFB24MOD) \ libcfb32.la \ libfb.la \ liblayer.la \ |