[xserver-commit] xserver/hw/kdrive/linux Makefile.am,1.6.2.2,1.6.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory pdx:/tmp/cvs-serv3073/hw/kdrive/linux

Modified Files:
      Tag: xfixes_2_branch
	Makefile.am 
Log Message:
	* Makefile.am:
	* Xext/Makefile.am:
	* configure.ac:
	* damageext/Makefile.am:
	* dix/Makefile.am:
	* fb/Makefile.am:
	* hw/kdrive/fbdev/Makefile.am:
	* hw/kdrive/linux/Makefile.am:
	* hw/kdrive/mach64/Makefile.am:
	* hw/kdrive/mga/Makefile.am:
	* hw/kdrive/nvidia/Makefile.am:
	* hw/kdrive/r128/Makefile.am:
	* hw/kdrive/smi/Makefile.am:
	* hw/kdrive/src/Makefile.am:
	* hw/kdrive/vesa/Makefile.am:
	* hw/xnest/Makefile.am:
	* mi/Makefile.am:
	* miext/damage/Makefile.am:
	* miext/shadow/Makefile.am:
	* os/Makefile.am:
	* randr/Makefile.am:
	* render/Makefile.am:
	* xfixes/Makefile.am:
	Make building (almost) work with automake 1.4 or 1.7.
	The dist-bzip2 option needs help still.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/Makefile.am,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- Makefile.am	24 Oct 2003 06:35:24 -0000	1.6.2.2
+++ Makefile.am	25 Oct 2003 06:10:48 -0000	1.6.2.3
@@ -1,10 +1,18 @@
 INCLUDES = 					\
 	@KDRIVE_INCS@				\
-	$(XSERVER_CFLAGS)
+	@XSERVER_CFLAGS@
 
 
 noinst_LIBRARIES = liblinux.a
 
+if TSLIB
+TSLIB_C = tslib.c
+endif
+
+if H3600_TS
+TS_C = ts.c
+endif
+
 liblinux_a_SOURCES = 	\
 	agp.c		\
 	bus.c		\
@@ -12,12 +20,18 @@
 	linux.c		\
 	mouse.c		\
 	ms.c		\
-	ps2.c
+	ps2.c		\
+	$(TSLIB_C)	\
+	$(TS_C)
 
-if TSLIB
-liblinux_a_SOURCES += tslib.c
-endif
+liblinux_a_DEPENDENCIES = \
+	agp.c		\
+	bus.c		\
+	keyboard.c	\
+	linux.c		\
+	mouse.c		\
+	ms.c		\
+	ps2.c		\
+	$(TSLIB_C)	\
+	$(TS_C)
 
-if H3600_TS
-liblinux_a_SOURCES += ts.c
-endif