[xserver-commit] xserver/hw/xizzle Makefile.am,1.9,1.10 ChangeLog,1.7,NONE

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am 
Removed Files:
	ChangeLog 
Log Message:
Down to 20 link errors now (count 'em!).

        * *.c:
        * *.h:
        Get rid of all references to SCO.

        * hw/xizzle/*/Makefile.am:
        Change SDK include dir to $(includedir)/xizzle.
        Add SDK libs where necessary.

        * hw/xizzle/Makefile.am:
        Reformat to be nicer and easier to shuffle around; also, fix lib
        ordering so we get so much closer to the elusive final link.
        Shuffle common/xf86Init.c into libxizzle.a.

        * hw/xizzle/common/Makefile.am:
        Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK
        stuff conditional as needed; fix the SBus includes.

        * hw/xizzle/os-support/Makefile.am:
        Name library os-support/libxizzleos.a, not
        os-support/foo/libxizzlefoo.a.
        Clean up ARCH_SOURCES so it's always initialised to something.

        * hw/xizzle/os-support/linux/Makefile.am:
        Move linked libraries to _LIBADD, which somehow escaped my attention.
        Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.

        * hw/xizzle/vbe/vbe.c:
        s/VERSION/VBE_VERSION/;

        * hw/xizzle/Xi:
        Axe this redundant dir.

        * configure.ac:
        All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
        required modules to be vaguely sane, add some pertinent libs/incs.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/Makefile.am	7 Mar 2004 13:12:48 -0000	1.9
+++ b/Makefile.am	10 Mar 2004 11:50:31 -0000	1.10
@@ -1,28 +1,41 @@
-if XINPUT
-XINPUT_SUBDIRS=Xi
-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)
+SUBDIRS = common ddc dummylib i2c int10 fbdevhw loader os-support parser rac \
+          ramdac shadowfb vbe vgahw xaa drivers
 
 bin_PROGRAMS = Xizzle
 
 Xizzle_SOURCES = dummy.c
 
-XIZZLE_LIBS=@XIZZLE_LIBS@
+OS_LIBS = os-support/bus/libxizzlebus.a \
+          os-support/libxizzleos.a
 
-Xizzle_LDADD = $(XIZZLE_LIBS) common/libxizzlecommon.a ddc/libxizzleddc.a \
-               dummylib/libxizzledummy.a i2c/libxizzlei2c.a \
-	       int10/libxizzleint10.a fbdevhw/libxizzlefbdevhw.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 \
-               os-support/$(XIZZLE_OS_SUBDIR)/libxizzle$(XIZZLE_OS_SUBDIR).a \
-               os-support/bus/libxizzlebus.a
+DRIVER_LIBS = drivers/libdrivers.a \
+              drivers/ati/libati.a
+
+XIZZLE_LIBS = common/libxizzlehelper.a \
+              @XIZZLE_CORE_LIBS@ \
+              common/libxizzlecommon.a \
+              ddc/libxizzleddc.a \
+              dummylib/libxizzledummy.a \
+              i2c/libxizzlei2c.a \
+              int10/libxizzleint10.a \
+              fbdevhw/libxizzlefbdevhw.a \
+              loader/libxizzleloader.a \
+              $(OS_LIBS) \
+              parser/libxizzleparser.a \
+              rac/libxizzlerac.a \
+              ramdac/libxizzleramdac.a \
+              shadowfb/libxizzleshadowfb.a \
+              vbe/libxizzlevbe.a \
+              vgahw/libxizzlevgahw.a \
+              xaa/libxizzlexaa.a \
+              $(DRIVER_LIBS) \
+              @XIZZLE_LIBS@
+
+AM_CFLAGS = $(XIZZLE_CFLAGS)
+INCLUDES = $(XIZZLE_INCS) -I$(srcdir)/loader -I$(srcdir)/ddc -I$(srcdir)/i2c
+
+Xizzle_LDADD = $(XIZZLE_LIBS) \
+               @XSERVER_LIBS@
 
 dummy.c:
 	touch $@

--- ChangeLog DELETED ---