From 8d38172d866775594af3185ae3fbd8d750677650 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 14 Feb 2010 13:47:55 +0000
Subject: Updated to xorg-server-1.7.99.901

---
 xorg-server/hw/kdrive/linux/Makefile.in | 41 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'xorg-server/hw/kdrive/linux')

diff --git a/xorg-server/hw/kdrive/linux/Makefile.in b/xorg-server/hw/kdrive/linux/Makefile.in
index f6e1f5b6e..46615d6e2 100644
--- a/xorg-server/hw/kdrive/linux/Makefile.in
+++ b/xorg-server/hw/kdrive/linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,6 +34,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@KDRIVE_KBD_TRUE@am__append_1 = keyboard.c
+@KDRIVE_EVDEV_TRUE@am__append_2 = evdev.c
+@KDRIVE_MOUSE_TRUE@am__append_3 = mouse.c ms.c ps2.c
+@TSLIB_TRUE@am__append_4 = tslib.c
 subdir = hw/kdrive/linux
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,12 +61,14 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 liblinux_la_LIBADD =
-am__liblinux_la_SOURCES_DIST = bus.c mouse.c ms.c ps2.c evdev.c \
-	keyboard.c linux.c tslib.c
-am__objects_1 = evdev.lo keyboard.lo linux.lo
-@TSLIB_TRUE@am__objects_2 = tslib.lo
-am_liblinux_la_OBJECTS = bus.lo mouse.lo ms.lo ps2.lo $(am__objects_1) \
-	$(am__objects_2)
+am__liblinux_la_SOURCES_DIST = linux.c keyboard.c evdev.c mouse.c ms.c \
+	ps2.c tslib.c
+@KDRIVE_KBD_TRUE@am__objects_1 = keyboard.lo
+@KDRIVE_EVDEV_TRUE@am__objects_2 = evdev.lo
+@KDRIVE_MOUSE_TRUE@am__objects_3 = mouse.lo ms.lo ps2.lo
+@TSLIB_TRUE@am__objects_4 = tslib.lo
+am_liblinux_la_OBJECTS = linux.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4)
 liblinux_la_OBJECTS = $(am_liblinux_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -268,8 +274,11 @@ SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
 STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
 TSLIB_CFLAGS = @TSLIB_CFLAGS@
 TSLIB_LIBS = @TSLIB_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
+UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
@@ -329,6 +338,7 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+__XCONFIGDIR__ = @__XCONFIGDIR__@
 __XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
@@ -398,20 +408,8 @@ INCLUDES = \
 
 AM_CFLAGS = -DHAVE_DIX_CONFIG_H
 noinst_LTLIBRARIES = liblinux.la
-@TSLIB_TRUE@TSLIB_C = tslib.c
-KDRIVE_HW_SOURCES = \
-	evdev.c		\
-	keyboard.c	\
-	linux.c
-
-liblinux_la_SOURCES = \
-	bus.c		\
-	mouse.c		\
-	ms.c		\
-	ps2.c		\
-	$(KDRIVE_HW_SOURCES) \
-	$(TSLIB_C)
-
+liblinux_la_SOURCES = linux.c $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_4)
 all: all-am
 
 .SUFFIXES:
@@ -464,7 +462,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bus.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evdev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@
-- 
cgit v1.2.3