From f4957ee94810b471110deebf03d7413399b45db3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 9 Dec 2005 18:30:51 +0000 Subject: Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith) --- ChangeLog | 7 +++++++ hw/xfree86/Makefile.am | 6 +----- hw/xfree86/xf8_32wid/Makefile.am | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index adfbc5712..a80c1b62f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-12-09 Adam Jackson + + * configure.ac: + * hw/xfree86/Makefile.am: + * hw/xfree86/xf8_32wid/Makefile.am: + Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith) + 2005-12-08 Adam Jackson * configure.ac: diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 85a213090..e4f1a3877 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -4,13 +4,9 @@ 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_SUBDIR) loader scanpci dixmods exa \ + xf8_32bpp xf8_32wid loader scanpci dixmods exa \ $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am index ef46a9a6f..1eba92d37 100644 --- a/hw/xfree86/xf8_32wid/Makefile.am +++ b/hw/xfree86/xf8_32wid/Makefile.am @@ -1,4 +1,6 @@ +if BUILD_XF8_32WID module_LTLIBRARIES = libxf8_32wid.la +endif sdk_HEADERS = cfb8_32wid.h -- cgit v1.2.3