diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
| commit | 24635abae6008bef13e30d798b3f33abab412770 (patch) | |
| tree | e799fbde24e0fd935af76b0bc48d30ef69f75d54 /xorg-server/hw/dmx/input/Makefile.am | |
| parent | e0844ae8b5ef87049537a7e0ebff81acc2695256 (diff) | |
| parent | 6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff) | |
| download | vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2 vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Changed file permissions
dos -> unix
Conflicts:
libX11/include/X11/Xregion.h
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/StrKeysym.c
libX11/src/Window.c
libX11/src/xkb/XKBBind.c
libX11/src/xkb/XKBGetMap.c
libX11/src/xkb/XKBSetGeom.c
libX11/src/xkb/XKBUse.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libXdmcp/Key.c
libXdmcp/Write.c
libxcb/src/xcb_windefs.h
xkbcomp/keycodes.c
xkbcomp/xkbpath.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mln_s.sh
xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'xorg-server/hw/dmx/input/Makefile.am')
| -rw-r--r-- | xorg-server/hw/dmx/input/Makefile.am | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/xorg-server/hw/dmx/input/Makefile.am b/xorg-server/hw/dmx/input/Makefile.am index ebe9a0843..185aaf84e 100644 --- a/xorg-server/hw/dmx/input/Makefile.am +++ b/xorg-server/hw/dmx/input/Makefile.am @@ -1,67 +1,67 @@ -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 \
- usb-mouse.h \
- usb-other.c \
- usb-other.h \
- usb-common.c \
- usb-common.h \
- usb-private.h
-endif
-
-DRVSRCS = dmxdummy.c \
- dmxdummy.h \
- dmxbackend.c \
- dmxbackend.h \
- dmxconsole.c \
- dmxconsole.h \
- dmxcommon.c \
- dmxcommon.h
-
-DMXSRCS = dmxinputinit.c \
- dmxinputinit.h \
- dmxarg.c \
- dmxarg.h \
- dmxsigio.c \
- dmxsigio.h \
- dmxevents.c \
- dmxevents.h \
- dmxxinput.c \
- dmxmotion.c \
- dmxmotion.h \
- dmxmap.c \
- dmxmap.h
-
-
-libdmxinput_a_SOURCES = ChkNotMaskEv.c \
- ChkNotMaskEv.h \
- atKeynames.h \
- $(RAWSRCS) \
- $(USBSRCS) \
- $(DRVSRCS) \
- $(DMXSRCS) \
- $(LIBSRCS)
-
-if GLX
-GLX_DEFS = @GL_CFLAGS@
-endif
-
-AM_CFLAGS = $(DIX_CFLAGS) \
- -I$(top_srcdir)/hw/dmx \
- -DHAVE_DMX_CONFIG_H \
- $(GLX_DEFS) \
- @DMXMODULES_CFLAGS@
-
-EXTRA_DIST = dmxdetach.c
+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 \ + usb-mouse.h \ + usb-other.c \ + usb-other.h \ + usb-common.c \ + usb-common.h \ + usb-private.h +endif + +DRVSRCS = dmxdummy.c \ + dmxdummy.h \ + dmxbackend.c \ + dmxbackend.h \ + dmxconsole.c \ + dmxconsole.h \ + dmxcommon.c \ + dmxcommon.h + +DMXSRCS = dmxinputinit.c \ + dmxinputinit.h \ + dmxarg.c \ + dmxarg.h \ + dmxsigio.c \ + dmxsigio.h \ + dmxevents.c \ + dmxevents.h \ + dmxxinput.c \ + dmxmotion.c \ + dmxmotion.h \ + dmxmap.c \ + dmxmap.h + + +libdmxinput_a_SOURCES = ChkNotMaskEv.c \ + ChkNotMaskEv.h \ + atKeynames.h \ + $(RAWSRCS) \ + $(USBSRCS) \ + $(DRVSRCS) \ + $(DMXSRCS) \ + $(LIBSRCS) + +if GLX +GLX_DEFS = @GL_CFLAGS@ +endif + +AM_CFLAGS = $(DIX_CFLAGS) \ + -I$(top_srcdir)/hw/dmx \ + -DHAVE_DMX_CONFIG_H \ + $(GLX_DEFS) \ + @DMXMODULES_CFLAGS@ + +EXTRA_DIST = dmxdetach.c |