aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-08 14:29:46 +0200
committermarha <marha@users.sourceforge.net>2012-06-08 14:50:37 +0200
commit72ec0e3bb2d7fc6b77b2a75873792f781679da6a (patch)
tree0a736ab9a8c26276929ab077dc661e3625b54884 /xorg-server/Xi
parent5e865910f0ce672295bd60460631339be5e311a0 (diff)
parent990bc3f015a4f8fce2eb918375defcd44980a845 (diff)
downloadvcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.gz
vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.bz2
vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c 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/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/Makefile.am216
1 files changed, 108 insertions, 108 deletions
diff --git a/xorg-server/Xi/Makefile.am b/xorg-server/Xi/Makefile.am
index 69c7886b9..499e7056d 100644
--- a/xorg-server/Xi/Makefile.am
+++ b/xorg-server/Xi/Makefile.am
@@ -1,108 +1,108 @@
-noinst_LTLIBRARIES = libXi.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-libXi_la_SOURCES = \
- allowev.c \
- allowev.h \
- chgdctl.c \
- chgdctl.h \
- chgfctl.c \
- chgfctl.h \
- chgkbd.c \
- chgkbd.h \
- chgkmap.c \
- chgkmap.h \
- chgprop.c \
- chgprop.h \
- chgptr.c \
- chgptr.h \
- closedev.c \
- closedev.h \
- devbell.c \
- devbell.h \
- exevents.c \
- exglobals.h \
- extinit.c \
- getbmap.c \
- getbmap.h \
- getdctl.c \
- getdctl.h \
- getfctl.c \
- getfctl.h \
- getfocus.c \
- getfocus.h \
- getkmap.c \
- getkmap.h \
- getmmap.c \
- getmmap.h \
- getprop.c \
- getprop.h \
- getselev.c \
- getselev.h \
- getvers.c \
- getvers.h \
- grabdev.c \
- grabdev.h \
- grabdevb.c \
- grabdevb.h \
- grabdevk.c \
- grabdevk.h \
- gtmotion.c \
- gtmotion.h \
- listdev.c \
- listdev.h \
- opendev.c \
- opendev.h \
- queryst.c \
- queryst.h \
- selectev.c \
- selectev.h \
- sendexev.c \
- sendexev.h \
- setbmap.c \
- setbmap.h \
- setdval.c \
- setdval.h \
- setfocus.c \
- setfocus.h \
- setmmap.c \
- setmmap.h \
- setmode.c \
- setmode.h \
- ungrdev.c \
- ungrdev.h \
- ungrdevb.c \
- ungrdevb.h \
- ungrdevk.c \
- ungrdevk.h \
- xiallowev.c \
- xiallowev.h \
- xichangecursor.c \
- xichangecursor.h \
- xichangehierarchy.c \
- xichangehierarchy.h \
- xigetclientpointer.c \
- xigetclientpointer.h \
- xigrabdev.c \
- xigrabdev.h \
- xipassivegrab.h \
- xipassivegrab.c \
- xiproperty.c \
- xiproperty.h \
- xiquerydevice.c \
- xiquerydevice.h \
- xiquerypointer.c \
- xiquerypointer.h \
- xiqueryversion.c \
- xiqueryversion.h \
- xiselectev.c \
- xiselectev.h \
- xisetclientpointer.c \
- xisetclientpointer.h \
- xisetdevfocus.c \
- xisetdevfocus.h \
- xiwarppointer.c \
- xiwarppointer.h
-
-EXTRA_DIST = stubs.c
+noinst_LTLIBRARIES = libXi.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+libXi_la_SOURCES = \
+ allowev.c \
+ allowev.h \
+ chgdctl.c \
+ chgdctl.h \
+ chgfctl.c \
+ chgfctl.h \
+ chgkbd.c \
+ chgkbd.h \
+ chgkmap.c \
+ chgkmap.h \
+ chgprop.c \
+ chgprop.h \
+ chgptr.c \
+ chgptr.h \
+ closedev.c \
+ closedev.h \
+ devbell.c \
+ devbell.h \
+ exevents.c \
+ exglobals.h \
+ extinit.c \
+ getbmap.c \
+ getbmap.h \
+ getdctl.c \
+ getdctl.h \
+ getfctl.c \
+ getfctl.h \
+ getfocus.c \
+ getfocus.h \
+ getkmap.c \
+ getkmap.h \
+ getmmap.c \
+ getmmap.h \
+ getprop.c \
+ getprop.h \
+ getselev.c \
+ getselev.h \
+ getvers.c \
+ getvers.h \
+ grabdev.c \
+ grabdev.h \
+ grabdevb.c \
+ grabdevb.h \
+ grabdevk.c \
+ grabdevk.h \
+ gtmotion.c \
+ gtmotion.h \
+ listdev.c \
+ listdev.h \
+ opendev.c \
+ opendev.h \
+ queryst.c \
+ queryst.h \
+ selectev.c \
+ selectev.h \
+ sendexev.c \
+ sendexev.h \
+ setbmap.c \
+ setbmap.h \
+ setdval.c \
+ setdval.h \
+ setfocus.c \
+ setfocus.h \
+ setmmap.c \
+ setmmap.h \
+ setmode.c \
+ setmode.h \
+ ungrdev.c \
+ ungrdev.h \
+ ungrdevb.c \
+ ungrdevb.h \
+ ungrdevk.c \
+ ungrdevk.h \
+ xiallowev.c \
+ xiallowev.h \
+ xichangecursor.c \
+ xichangecursor.h \
+ xichangehierarchy.c \
+ xichangehierarchy.h \
+ xigetclientpointer.c \
+ xigetclientpointer.h \
+ xigrabdev.c \
+ xigrabdev.h \
+ xipassivegrab.h \
+ xipassivegrab.c \
+ xiproperty.c \
+ xiproperty.h \
+ xiquerydevice.c \
+ xiquerydevice.h \
+ xiquerypointer.c \
+ xiquerypointer.h \
+ xiqueryversion.c \
+ xiqueryversion.h \
+ xiselectev.c \
+ xiselectev.h \
+ xisetclientpointer.c \
+ xisetclientpointer.h \
+ xisetdevfocus.c \
+ xisetdevfocus.h \
+ xiwarppointer.c \
+ xiwarppointer.h
+
+EXTRA_DIST = stubs.c