[xserver-commit] xserver/hw/xizzle/i2c Makefile.am,1.2,1.3

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am 
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/i2c/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	7 Mar 2004 11:58:13 -0000	1.2
+++ b/Makefile.am	10 Mar 2004 11:50:32 -0000	1.3
@@ -3,5 +3,5 @@
 INCLUDES = $(XIZZLE_INCS)
 AM_CFLAGS = $(XIZZLE_CFLAGS)
 
-sdk_INCLUDEDIR = $(includedir)/X11/XIZZLESDK
+sdk_INCLUDEDIR = $(includedir)/xizzle
 sdk_INCLUDES = xf86i2c.h