[xserver-commit] xizzle/common Makefile.am,3.2,3.3 xf86.h,3.178,3.179

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xizzle/common
In directory pdx:/tmp/cvs-serv13484/common

Modified Files:
	Makefile.am xf86.h 
Log Message:
Fo'shizzle, I'm renaming the XFree86 DDX (hw/xfree86) to Xizzle (hw/xizzle), per
Mike Harris's suggestion.

It was getting way too confusing, so this DDX can now unambiguously be referred
to as 'Xizzle'. If anyone thinks the name sucks, email me/the list, and if the
name's better, we can move to that without too much hassle.

/cvs/xserver/xfree86 -> /cvs/xserver/xizzle
hw/xfree86 -> hw/xizzle
$(XF86_*) -> $(XIZZLE_foo)
libxf86* -> libxizzlefoo
XFree86 -> Xizzle


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xizzle/common/Makefile.am,v
retrieving revision 3.2
retrieving revision 3.3
diff -u -d -r3.2 -r3.3
--- a/Makefile.am	28 Feb 2004 01:27:38 -0000	3.2
+++ b/Makefile.am	7 Mar 2004 11:58:13 -0000	3.3
@@ -1,4 +1,4 @@
-lib_LIBRARIES = libxf86common.a
+lib_LIBRARIES = libxizzlecommon.a
 
 #if SPARC
 #SBUSSOURCES = xf86sbusBus.c
@@ -40,7 +40,7 @@
 
 # shouldn't isaBus and pciBus only be built on the relevant architectures? -ds
 # ditto DoScanPci
-libxf86common_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
+libxizzlecommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                           xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
                           xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
                           xf86Globals.c xf86Helper.c xf86Init.c xf86Io.c \
@@ -50,15 +50,15 @@
                           $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
                           $(KBDSOURCES)
 
-AM_CFLAGS = $(XF86_CFLAGS)
+AM_CFLAGS = $(XIZZLE_CFLAGS)
 
-INCLUDES = $(XF86_INCS) -I$(top_srcdir)/mi \
+INCLUDES = $(XIZZLE_INCS) -I$(top_srcdir)/mi \
            -I$(srcdir)/../loader -I$(srcdir)/../ddc \
            -I$(srcdir)/../rac -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
            -I$(srcdir)/../i2c -I$(srcdir)/../parser -I$(srcdir)/../vgahw \
            -I$(srcdir)/../Xi -I$(top_srcdir)/os
 
-sdk_INCLUDEDIR = $(includedir)/X11/XF86SDK
+sdk_INCLUDEDIR = $(includedir)/X11/XIZZLESDK
 sdk_INCLUDES = compiler.h fourcc.h xf86.h xf86Module.h xf8Opt.h xf86Pci.h \
                xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
                xf86Version.h xf86Version.h xf86Xinput.h xf86cmap.h xf86fbman.h \

Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xizzle/common/xf86.h,v
retrieving revision 3.178
retrieving revision 3.179
diff -u -d -r3.178 -r3.179
--- a/xf86.h	7 Mar 2004 11:07:58 -0000	3.178
+++ b/xf86.h	7 Mar 2004 11:58:13 -0000	3.179
@@ -450,9 +450,9 @@
 extern Bool noXkbExtension;
 
 /* FIXME FIXME FIXME XXX FIXME FIXME */
-#define DEFAULT_MODULE_PATH "/opt/fdo/lib/xfree86/modules"
-#define DEFAULT_LOGPREFIX "/var/log/XFree86."
-#define XF86CONFIGFILE "/etc/xfree86.conf"
+#define DEFAULT_MODULE_PATH "/opt/fdo/lib/xizzle/modules"
+#define DEFAULT_LOGPREFIX "/var/log/Xizzle."
+#define XF86CONFIGFILE "/etc/xizzle.conf"
 #define XORG_RELEASE " "
 
 #define DPMS_SERVER
@@ -470,10 +470,6 @@
 extern Bool DPMSDisabledSwitch;
 extern Bool DPMSCapableFlag;
 
-#define NO_XFIXES
-#define NO_DAMAGE
-#define NO_COMPOSITE
-
 #if defined(__linux__)
 #define OSNAME "linux"
 #elif defined(__FreeBSD__)