summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-09-21 00:24:10 +0000
committerAdam Jackson <ajax@nwnk.net>2005-09-21 00:24:10 +0000
commit00bd8968b264c1f69487dd99c212e0ce889b11db (patch)
tree525b8c43d4c0cb925d8f11373245679c69a576b5
parentb7e723ed6f23cc8d85f1f1eced9d8ccbc2a6b38c (diff)
Bug #4257: Move cfbcmap.c to cfb_common_sources.
-rw-r--r--ChangeLog6
-rw-r--r--cfb/Makefile.am4
-rw-r--r--cfb/Makefile.am.inc3
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 <ajax@freedesktop.org>
+
+ * cfb/Makefile.am:
+ * cfb/Makefile.am.inc:
+ Bug #4257: Move cfbcmap.c to cfb_common_sources.
+
2005-09-20 Alan Coopersmith <alan.coopersmith@sun.com>
* 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" > $@