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/kdrive/src | |
| 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/kdrive/src')
| -rw-r--r-- | xorg-server/hw/kdrive/src/Makefile.am | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/xorg-server/hw/kdrive/src/Makefile.am b/xorg-server/hw/kdrive/src/Makefile.am index 477ad673a..51375b950 100644 --- a/xorg-server/hw/kdrive/src/Makefile.am +++ b/xorg-server/hw/kdrive/src/Makefile.am @@ -1,28 +1,28 @@ -INCLUDES = \
- @KDRIVE_INCS@ \
- @KDRIVE_CFLAGS@
-
-AM_CFLAGS = -DHAVE_DIX_CONFIG_H
-
-noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
-
-if XV
-KDRIVE_XV_SOURCES = \
- kxv.c \
- kxv.h
-endif
-
-libkdrive_la_SOURCES = \
- fourcc.h \
- kcmap.c \
- kdrive.c \
- kdrive.h \
- kinfo.c \
- kinput.c \
- kmode.c \
- kshadow.c \
- $(KDRIVE_XV_SOURCES) \
- $(top_srcdir)/mi/miinitext.c
-
-libkdrivestubs_la_SOURCES = \
- $(top_srcdir)/fb/fbcmap_mi.c
+INCLUDES = \ + @KDRIVE_INCS@ \ + @KDRIVE_CFLAGS@ + +AM_CFLAGS = -DHAVE_DIX_CONFIG_H + +noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la + +if XV +KDRIVE_XV_SOURCES = \ + kxv.c \ + kxv.h +endif + +libkdrive_la_SOURCES = \ + fourcc.h \ + kcmap.c \ + kdrive.c \ + kdrive.h \ + kinfo.c \ + kinput.c \ + kmode.c \ + kshadow.c \ + $(KDRIVE_XV_SOURCES) \ + $(top_srcdir)/mi/miinitext.c + +libkdrivestubs_la_SOURCES = \ + $(top_srcdir)/fb/fbcmap_mi.c |