[xserver-commit] xserver/hw/xizzle/os-support/linux Makefile.am,3.4,3.5

[Daniel Stone]

Committed by: daniel

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

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/os-support/linux/Makefile.am,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/Makefile.am	7 Mar 2004 11:58:13 -0000	3.4
+++ b/Makefile.am	10 Mar 2004 11:50:33 -0000	3.5
@@ -1,3 +1,8 @@
+if DRI
+DRI_SUBDIRS=drm
+DRI_LIBS=drm/libxizzlelinuxdrm.a
+endif
+
 lib_LIBRARIES = libxizzlelinux.a
 libxizzlelinux_a_SOURCES = lnx_mouse.c lnx_kbd.c lnx_KbdMap.c \
                            lnx_init.c lnx_video.c lnx_io.c \
@@ -6,17 +11,13 @@
                            ../shared/bios_mmap.c ../shared/VTsw_usl.c \
                            ../shared/std_kbdEv.c ../shared/posix_tty.c \
                            ../shared/vidmem.c ../shared/sigio.c \
-                           ../shared/stdResource.c \
-                           $(builddir)/int10/libxizzlelinuxint10.a \
-                           $(builddir)/drm/libxizzlelinuxdrm.a
+                           ../shared/stdResource.c
+libxizzlelinux_a_LIBADD = int10/libxizzlelinuxint10.a \
+                          $(DRI_LIBS)
 
-sdk_INCLUDEDIR = $(includedir)/X11/XIZZLESDK
+sdk_INCLUDEDIR = $(includedir)/xizzle
 sdk_INCLUDES = agpgart.h
 INCLUDES = $(XIZZLE_INCS)
-AM_CFLAGS = $(XIZZLE_CFLAGS) -D_BSD_SOURCE
-
-if DRI
-DRI_SUBDIRS=drm
-endif
+AM_CFLAGS = $(XIZZLE_CFLAGS)
 
 SUBDIRS = int10 $(DRI_SUBDIRS)