Index: configure.ac
===================================================================
RCS file: /home/ncvs/xserver/xserver/xserver/configure.ac,v
retrieving revision 3.27
diff -u -r3.27 configure.ac
--- configure.ac	12 Oct 2003 16:11:11 -0000	3.27
+++ configure.ac	25 Oct 2003 05:08:50 -0000
@@ -23,10 +23,10 @@
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ(2.57)
+AC_PREREQ(2.53)
 AC_INIT([Xserver],6.6.1,[keithp@keithp.com],Xserver)
+AM_INIT_AUTOMAKE([Xserver],6.6.1)
 AC_CONFIG_SRCDIR([Makefile.am])
-AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(include/config.h)
 
Index: Xext/Makefile.am
===================================================================
RCS file: /home/ncvs/xserver/xserver/xserver/Xext/Makefile.am,v
retrieving revision 3.5
diff -u -r3.5 Makefile.am
--- Xext/Makefile.am	4 Oct 2003 02:43:16 -0000	3.5
+++ Xext/Makefile.am	25 Oct 2003 04:43:11 -0000
@@ -4,29 +4,34 @@
 
 noinst_LIBRARIES = libXext.a
 
-libXext_a_SOURCES =	\
-	bigreq.c	\
-	mitmisc.c	\
-	shape.c		\
-	sleepuntil.c	\
-	sync.c		\
-	xtest.c		\
-	xtest1di.c	\
-	xtest1dd.c	\
-	xcmisc.c
-
 if MITSHM
-libXext_a_SOURCES += shm.c
+MITSHM_SRC = shm.c
 endif
 
 if XV
-libXext_a_SOURCES += xvmain.c xvdisp.c xvmc.c
+XV_SERC = xvmain.c xvdisp.c xvmc.c
 endif
 
 if RES
-libXext_a_SOURCES += xres.c
+RES_SRC = xres.c
 endif
 
 if SCREENSAVER
-libXext_a_SOURCES += saver.c
+SAVER_SRC = saver.c
 endif
+
+libXext_a_SOURCES =	\
+	bigreq.c	\
+	mitmisc.c	\
+	shape.c		\
+	sleepuntil.c	\
+	sync.c		\
+	xtest.c		\
+	xtest1di.c	\
+	xtest1dd.c	\
+	xcmisc.c	\
+	$(MITSHM_SRC)	\
+	$(XV_SERC)	\
+	$(RES_SRC)	\
+	$(SAVER_SRC)
+
Index: hw/kdrive/fbdev/Makefile.am
===================================================================
RCS file: /home/ncvs/xserver/xserver/xserver/hw/kdrive/fbdev/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- hw/kdrive/fbdev/Makefile.am	15 Oct 2003 04:59:45 -0000	1.6
+++ hw/kdrive/fbdev/Makefile.am	25 Oct 2003 04:44:57 -0000
@@ -18,6 +18,10 @@
 Xfbdev_SOURCES = \
 	fbinit.c
 
+if TSLIB
+XFBDEV_LIBS = -lts
+endif
+
 Xfbdev_LDADD = \
 	libfbdev.a					\
 	$(top_builddir)/dix/libdix.a			\
@@ -37,9 +41,5 @@
 	$(top_builddir)/xfixes/libxfixes.a		\
 	$(top_builddir)/dix/libxpstubs.a		\
 	$(XSERVER_LIBS)					\
-	-lm -lz
-
-if TSLIB
-Xfbdev_LDADD += -lts
-endif
-
+	$(XFBDEV_LIBS)					\
+	-lm -lz	
Index: hw/kdrive/linux/Makefile.am
===================================================================
RCS file: /home/ncvs/xserver/xserver/xserver/hw/kdrive/linux/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- hw/kdrive/linux/Makefile.am	4 Oct 2003 02:56:54 -0000	1.6
+++ hw/kdrive/linux/Makefile.am	25 Oct 2003 04:44:05 -0000
@@ -11,6 +11,14 @@
 
 noinst_LIBRARIES = liblinux.a
 
+if TSLIB
+TSLIB_SRC = tslib.c
+endif
+
+if H3600_TS
+H3600_TS_SRC = ts.c
+endif
+
 liblinux_a_SOURCES = 	\
 	agp.c		\
 	bus.c		\
@@ -18,12 +26,6 @@
 	linux.c		\
 	mouse.c		\
 	ms.c		\
-	ps2.c
-
-if TSLIB
-liblinux_a_SOURCES += tslib.c
-endif
-
-if H3600_TS
-liblinux_a_SOURCES += ts.c
-endif
+	ps2.c		\
+	$(TSLIB_SRC)	\
+	$(H3600_TS_SRC)