diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
| commit | 2c6d47108880584f1221ff86c6c8947627f9f607 (patch) | |
| tree | 64a042f58df056433c430fb0c99735d9e8c0904d /xkb/Makefile.am | |
| parent | c4fe1bcce1c1e4822e688959b331b47a051d6e0a (diff) | |
| parent | 85220446359a75ea2c359b418b4051c04eea739c (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
Diffstat (limited to 'xkb/Makefile.am')
| -rw-r--r-- | xkb/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xkb/Makefile.am b/xkb/Makefile.am index 996d52761..78cdf7196 100644 --- a/xkb/Makefile.am +++ b/xkb/Makefile.am @@ -41,7 +41,8 @@ X11_SRCS = \ XKBGAlloc.c \ XKBMAlloc.c -XI_SRCS = xkbPrOtherEv.c +# ends up unused... +# XI_SRCS = xkbPrOtherEv.c libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \ $(X11_SRCS) |