From 00bd8968b264c1f69487dd99c212e0ce889b11db Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 21 Sep 2005 00:24:10 +0000 Subject: [PATCH] Bug #4257: Move cfbcmap.c to cfb_common_sources. --- ChangeLog | 6 ++++++ cfb/Makefile.am | 4 ++-- cfb/Makefile.am.inc | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72768d520..0bcd9ada1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-20 Adam Jackson + + * cfb/Makefile.am: + * cfb/Makefile.am.inc: + Bug #4257: Move cfbcmap.c to cfb_common_sources. + 2005-09-20 Alan Coopersmith * hw/xfree86/Makefile.am (install-exec-local): diff --git a/cfb/Makefile.am b/cfb/Makefile.am index 1ae63f31f..e150caf94 100644 --- a/cfb/Makefile.am +++ b/cfb/Makefile.am @@ -4,8 +4,8 @@ include Makefile.am.inc DISTCLEANFILES += cfbglrop8.c -libcfb_la_SOURCES = cfb8bit.c cfbcmap.c cfbteblt8.c cfbglrop8.c cfbpush8.c \ - cfbrctstp8.c $(libcfb_gen_sources) $(libcfb_common_sources) +libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \ + $(libcfb_gen_sources) $(libcfb_common_sources) libcfb_la_LIBADD = ../mfb/libmfb.la diff --git a/cfb/Makefile.am.inc b/cfb/Makefile.am.inc index 3bb204b6b..f28816dd5 100644 --- a/cfb/Makefile.am.inc +++ b/cfb/Makefile.am.inc @@ -18,7 +18,8 @@ libcfb_common_sources = $(top_srcdir)/cfb/cfbgc.c $(top_srcdir)/cfb/cfbrrop.c \ $(top_srcdir)/cfb/cfbbstore.c $(top_srcdir)/cfb/cfbpolypnt.c \ $(top_srcdir)/cfb/cfbbres.c $(top_srcdir)/cfb/cfbline.c \ $(top_srcdir)/cfb/cfbhrzvert.c $(top_srcdir)/cfb/cfbbresd.c \ - $(top_srcdir)/cfb/cfbimage.c $(top_srcdir)/cfb/cfbcppl.c + $(top_srcdir)/cfb/cfbimage.c $(top_srcdir)/cfb/cfbcppl.c \ + $(top_srcdir)/cfb/cfbcmap.c cfbseg.c: echo "#define POLYSEGMENT" > $@