[xserver-commit] xizzle Makefile.am,1.8,1.9

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am 
Log Message:
Wow-ee, there go another few screenfuls of errors. Appears .a's can't contain
other .a's - damn!

Makefile.am: link to os-support/ossubdir/os.a directly, ditto
os-support/bus/libxizzlebus.a
os-support/Makefile.am: drop libxizzleos.a


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xizzle/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/Makefile.am	7 Mar 2004 12:31:57 -0000	1.8
+++ b/Makefile.am	7 Mar 2004 13:12:48 -0000	1.9
@@ -15,12 +15,14 @@
 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 \
+	       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
+               @XSERVER_LIBS@ loader/libxizzleloader.a \
+               os-support/$(XIZZLE_OS_SUBDIR)/libxizzle$(XIZZLE_OS_SUBDIR).a \
+               os-support/bus/libxizzlebus.a
 
 dummy.c:
 	touch $@