[xserver-commit] xserver/hw/kdrive Makefile.am,1.20,1.21

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/kdrive
In directory pdx:/tmp/cvs-serv2122/hw/kdrive

Modified Files:
	Makefile.am 
Log Message:
Twenty link errors for Xizzle now - count 'em. 20.

        * *.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/kdrive/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/Makefile.am	28 Feb 2004 09:47:55 -0000	1.20
+++ b/Makefile.am	10 Mar 2004 11:49:11 -0000	1.21
@@ -6,7 +6,9 @@
 FBDEV_SUBDIRS = fbdev
 endif
 
-XSDL_SUBDIRS=@XSDL_DIRS@
+if XSDLSERVER
+XSDL_SUBDIRS=sdl
+endif
 
 SUBDIRS =			\
 	src			\