Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-09-07 15:43:31 +03:00 • committed by Daniel Stone
commit 5e9d33fe87
46 changed files with 1026 additions and 409 deletions

View file

@ -4,10 +4,6 @@ INCLUDES = \
noinst_LIBRARIES = libfbdev.a
if TSLIB
TSLIB_FLAG = -lts
endif
libfbdev_a_SOURCES = \
fbdev.c \
fbdev.h
@ -21,6 +17,5 @@ Xfbdev_SOURCES = \
Xfbdev_LDADD = \
libfbdev.a \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
@XSERVER_LIBS@
endif