diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/xfree86/os-support/bsd/Makefile.am | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/bsd/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/bsd/Makefile.am | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am index 4fc270aa9..e52dac13b 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/Makefile.am +++ b/xorg-server/hw/xfree86/os-support/bsd/Makefile.am @@ -1,9 +1,15 @@ noinst_LTLIBRARIES = libbsd.la -# FIXME: Add USB mouse support? - -# FIXME: APM support. +# APM support. +if BSD_KQUEUE_APM +APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c +else +if BSD_APM +APM_SOURCES = $(srcdir)/bsd_apm.c +else APM_SOURCES = $(srcdir)/../shared/pm_noop.c +endif +endif if FREEBSD_KLDLOAD KMOD_SOURCES = bsd_kmod.c @@ -59,7 +65,6 @@ libbsd_la_SOURCES = \ $(srcdir)/../shared/vidmem.c \ bsd_VTsw.c \ bsd_init.c \ - bsd_mouse.c \ bsd_bell.c \ $(ARCH_SOURCES) \ $(AGP_SOURCES) \ @@ -71,16 +76,4 @@ libbsd_la_SOURCES = \ # FIXME: Add these files to the build as needed EXTRA_DIST = \ - bsd_apm.c \ - bsd_jstk.c \ - bsd_kqueue_apm.c \ - bsdResource.c \ - memrange.h \ - libusb/data.c \ - libusb/descr.c \ - libusb/parse.c \ - libusb/usage.c \ - libusb/usb.3 \ - libusb/usb.h \ - libusb/usb_hid_usages \ - libusb/usbvar.h + memrange.h |