diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-08-24 15:18:06 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-08-24 15:18:06 +0000 |
| commit | 9657e0e9def47dba5b0bfa7461874362712a07bb (patch) | |
| tree | e7f136daf4a1efd74cef4686d4d0c75f0ace5fb4 /hw/dmx | |
| parent | 825a95a1fab69f84c99ae132888fced22e28be33 (diff) | |
Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found
Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't found
Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with
compilers other than gcc
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/dmx/input/Makefile.am | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 7a3116902..046580567 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -67,7 +67,7 @@ Xdmx_SOURCES = dmx.c \ #Xdmx_SOURCES += fakecw.c #endif -Xdmx_LDFLAGS = -rdynamic +Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xdmx_LDADD = $(XORG_CORE_LIBS) \ $(XDMX_LIBS) \ $(GLX_LIBS) \ diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 7568f19f3..1db9872fc 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -1,12 +1,15 @@ noinst_LIBRARIES = libdmxinput.a +if DMX_BUILD_LNX RAWSRCS = lnx-keyboard.c \ lnx-keyboard.h \ lnx-ms.c \ lnx-ms.h \ lnx-ps2.c \ lnx-ps2.h +endif +if DMX_BUILD_USB USBSRCS = usb-keyboard.c \ usb-keyboard.h \ usb-mouse.c \ @@ -16,6 +19,7 @@ USBSRCS = usb-keyboard.c \ usb-common.c \ usb-common.h \ usb-private.h +endif DRVSRCS = dmxdummy.c \ dmxdummy.h \ |