Remove cfb16, no longer used.

6 files changed, 10 insertions, 81 deletions

diff --git a/ChangeLog b/ChangeLog
index 44971216b..dd8a3144b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+
+	* Makefile.am:
+	* configure.ac:
+	* cfb16/.cvsignore:
+	* cfb16/Makefile.am:
+	* hw/xfree86/dixmods/Makefile.am:
+	* hw/xfree86/dixmods/cfb16module.c:
+	Remove cfb16, no longer used.
+
 2006-04-05  Fredrik Höglund  <fredrik@kde.org>
 
 	* Xext/Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 847615a0f..53992ae36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ endif
 
 if CFB
 CFB_DIR=cfb
-CFB16_DIR=cfb16
 CFB32_DIR=cfb32
 endif
 
diff --git a/cfb16/Makefile.am b/cfb16/Makefile.am
deleted file mode 100644
index 384d8bd74..000000000
--- a/cfb16/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-noinst_LTLIBRARIES = libcfb16.la
-
-include $(top_srcdir)/cfb/Makefile.am.inc
-
-libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
-
-INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
-
-AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
diff --git a/configure.ac b/configure.ac
index 2ba000744..d79ea592b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1623,7 +1623,6 @@ XTrap/Makefile
 lbx/Makefile
 mfb/Makefile
 cfb/Makefile
-cfb16/Makefile
 cfb32/Makefile
 mi/Makefile
 miext/Makefile
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 7b6afc4db..151dc7782 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -12,7 +12,6 @@ endif
 
 module_LTLIBRARIES = libafb.la \
                      libcfb.la \
-                     libcfb16.la \
                      libcfb32.la \
                      libfb.la \
                      libmfb.la \
@@ -56,10 +55,6 @@ libcfb_la_LDFLAGS = -avoid-version
 libcfb_la_LIBADD = $(top_builddir)/cfb/libcfb.la
 libcfb_la_SOURCES = cfbmodule.c
 
-libcfb16_la_LDFLAGS = -avoid-version
-libcfb16_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
-libcfb16_la_SOURCES = cfb16module.c
-
 libcfb32_la_LDFLAGS = -avoid-version
 libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
 libcfb32_la_SOURCES = cfb32module.c
diff --git a/hw/xfree86/dixmods/cfb16module.c b/hw/xfree86/dixmods/cfb16module.c
deleted file mode 100644
index f5ad48f4d..000000000
--- a/hw/xfree86/dixmods/cfb16module.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* $XFree86: xc/programs/Xserver/cfb16/cfbmodule.c,v 1.8 1999/01/26 05:53:49 dawes Exp $ */
-/*
- * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the XFree86 Project shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from the
- * XFree86 Project.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#define PSZ 16
-
-#ifdef XFree86LOADER
-
-#include "xf86Module.h"
-#include "cfb.h"
-
-static MODULESETUPPROTO(cfb16Setup);
-
-static XF86ModuleVersionInfo VersRec =
-{
-	"cfb16",
-	MODULEVENDORSTRING,
-	MODINFOSTRING1,
-	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
-	1, 0, 0,
-	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
-	ABI_ANSIC_VERSION,
-	MOD_CLASS_NONE,
-	{0,0,0,0}       /* signature, to be patched into the file by a tool */
-};
-
-XF86ModuleData cfb16ModuleData = { &VersRec, cfb16Setup, NULL };
-
-static pointer
-cfb16Setup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-    /* This modules requires cfb, so load it */
-    return LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL,
-			 errmaj, errmin);
-}
-
-#endif