diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-20 10:20:14 +0930 |
| commit | 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 (patch) | |
| tree | f64efb86b1bc5f0c864d6a4ad0d79291f96b1c15 /Xext/Makefile.am | |
| parent | fc7e2566cc076c0d979f74871bc436df43401058 (diff) | |
| parent | 0178b6a4abed0df3e90ba393709ed566105e7c2c (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
Diffstat (limited to 'Xext/Makefile.am')
| -rw-r--r-- | Xext/Makefile.am | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 42aa279d8..484fe2605 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -99,12 +99,6 @@ if XEVIE BUILTIN_SRCS += $(XEVIE_SRCS) endif -# XPrint: Printing via X Protocol -XPRINT_SRCS = xprint.c -if XPRINT -BUILTIN_SRCS += $(XPRINT_SRCS) -endif - # Multi-buffering extension MULTIBUFFER_SRCS = mbuf.c EXTRA_MULTIBUFFER_SRCS = mbufbf.c mbufpx.c @@ -150,7 +144,6 @@ EXTRA_DIST = \ $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ $(XEVIE_SRCS) \ - $(XPRINT_SRCS) \ $(MULTIBUFFER_SRCS) \ $(EXTRA_MULTIBUFFER_SRCS) \ $(FONTCACHE_SRCS) \ |