mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-11 23:43:06 +00:00
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
This commit is contained in:
commit
5e9d33fe87
46 changed files with 1026 additions and 409 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue