[xserver-commit] xizzle Makefile.am,1.6,1.7

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am 
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/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/Makefile.am	7 Mar 2004 11:07:58 -0000	1.6
+++ b/Makefile.am	7 Mar 2004 11:58:13 -0000	1.7
@@ -1,25 +1,26 @@
 if XINPUT
 XINPUT_SUBDIRS=Xi
-XINPUT_LIBS=Xi/libxf86xi.a
+XINPUT_LIBS=Xi/libxizzlexi.a
 endif
 
 SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac ramdac \
           shadowfb vbe vgahw xaa drivers loader $(XINPUT_SUBDIRS)
 
-bin_PROGRAMS = XFree86
+bin_PROGRAMS = Xizzle
 
-XFree86_SOURCES = dummy.c
+Xizzle_SOURCES = dummy.c
 
-XF86_LIBS=@XF86_LIBS@
+XIZZLE_LIBS=@XIZZLE_LIBS@
 
-XFree86_LDADD = $(XF86_LIBS) common/libxf86common.a ddc/libxf86ddc.a \
-                  dummylib/libxf86dummy.a i2c/libxf86i2c.a int10/libxf86int10.a\
-                  fbdevhw/libxf86fbdevhw.a os-support/libxf86os.a \
-                  parser/libxf86parser.a rac/libxf86rac.a \
-                  ramdac/libxf86ramdac.a shadowfb/libxf86shadowfb.a \
-                  vbe/libxf86vbe.a vgahw/libxf86vgahw.a xaa/libxf86xaa.a \
-                  $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a \
-                  @XSERVER_LIBS@ loader/libxf86loader.a
+Xizzle_LDADD = $(XIZZLE_LIBS) common/libxizzlecommon.a ddc/libxizzleddc.a \
+               dummylib/libxizzledummy.a i2c/libxizzlei2c.a
+	       int10/libxizzleint10.a fbdevhw/libxizzlefbdevhw.a \
+	       os-support/libxizzleos.a parser/libxizzleparser.a \
+	       rac/libxizzlerac.a ramdac/libxizzleramdac.a \
+	       shadowfb/libxizzleshadowfb.a vbe/libxizzlevbe.a \
+	       vgahw/libxizzlevgahw.a xaa/libxizzlexaa.a \
+               $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a \
+               @XSERVER_LIBS@ loader/libxizzleloader.a
 
 dummy.c:
 	touch $@
@@ -27,5 +28,5 @@
 
 # Disabled because there's no real right way to do this, except all the defines
 # on the command line. And I'm not doing that. -Daniel
-XF86Config-4:
-	$(CPP) -o $(XF86CONFIG_CFLAGS) $@ $<
+xizzle.conf:
+	$(CPP) -o $(XIZZLECONFIG_CFLAGS) $@ $<