diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
| commit | 1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8 (patch) | |
| tree | 5ff2d27dc0c94b02beedeb4551f677691e606352 /xorg-server/hw/kdrive/linux/Makefile.am | |
| parent | d5ac51b006c039894e4e35102a8e182d21a52efc (diff) | |
| parent | 91a30d5622174febaa2107b010effcf2fb5b9a2e (diff) | |
| download | vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.gz vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.bz2 vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/linux/Makefile.am')
| -rw-r--r-- | xorg-server/hw/kdrive/linux/Makefile.am | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/xorg-server/hw/kdrive/linux/Makefile.am b/xorg-server/hw/kdrive/linux/Makefile.am index 13df142f7..fe4a3d183 100644 --- a/xorg-server/hw/kdrive/linux/Makefile.am +++ b/xorg-server/hw/kdrive/linux/Makefile.am @@ -6,19 +6,22 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H noinst_LTLIBRARIES = liblinux.la -if TSLIB -TSLIB_C = tslib.c +liblinux_la_SOURCES = + +liblinux_la_SOURCES += linux.c klinux.h + +if KDRIVE_KBD +liblinux_la_SOURCES += keyboard.c +endif + +if KDRIVE_EVDEV +liblinux_la_SOURCES += evdev.c endif -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) +if KDRIVE_MOUSE +liblinux_la_SOURCES += mouse.c ms.c ps2.c +endif + +if TSLIB +liblinux_la_SOURCES += tslib.c +endif |