[xserver-commit] xfree86 Makefile.am,1.5,1.6

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86
In directory pdx:/tmp/cvs-serv31169

Modified Files:
	Makefile.am 
Log Message:
common/xf86.h: s/static/extern/ for noXkbExtension - whoops.
Makefile.am, loader/*: Get the loader stuff going (sort of - this is
omgdodgyhack).


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/Makefile.am	5 Mar 2004 06:53:17 -0000	1.5
+++ b/Makefile.am	7 Mar 2004 11:07:58 -0000	1.6
@@ -4,7 +4,7 @@
 endif
 
 SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac ramdac \
-          shadowfb vbe vgahw xaa drivers $(XINPUT_SUBDIRS)
+          shadowfb vbe vgahw xaa drivers loader $(XINPUT_SUBDIRS)
 
 bin_PROGRAMS = XFree86
 
@@ -19,7 +19,7 @@
                   ramdac/libxf86ramdac.a shadowfb/libxf86shadowfb.a \
                   vbe/libxf86vbe.a vgahw/libxf86vgahw.a xaa/libxf86xaa.a \
                   $(XINPUT_LIBS) drivers/libdrivers.a drivers/ati/libati.a \
-                  @XSERVER_LIBS@
+                  @XSERVER_LIBS@ loader/libxf86loader.a
 
 dummy.c:
 	touch $@