diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-11-19 03:53:04 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-11-19 03:53:04 +0000 |
| commit | d3b6653a2892e8c929c79fe3ace19ac9d8366fc4 (patch) | |
| tree | 8b0e9e1ec9dbcf98f9c393f072d98cf208031d61 | |
| parent | 627ac1fe1dbcbc070575da7bee9e686a7dce5262 (diff) | |
Bug #4824: Build XTrap support by default, matching monolith.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 18 |
2 files changed, 12 insertions, 10 deletions
@@ -3,6 +3,10 @@ * hw/xfree86/os-support/linux/Makefile.am: Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck) + * configure.ac: + * hw/xfree86/dixmods/Makefile.am: + Bug #4824: Build XTrap support by default, matching monolith. + 2005-11-16 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index f8aac1ee9..e7b2a264b 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -6,9 +6,9 @@ if GLX GLXMODS = libglx.la libGLcore.la endif -# if XTRAP -# XTRAPMOD = libxtrap.la -# endif +if XTRAP +XTRAPMOD = libxtrap.la +endif module_LTLIBRARIES = libafb.la \ libbitmap.la \ @@ -24,8 +24,8 @@ module_LTLIBRARIES = libafb.la \ libshadow.la \ libfreetype.la \ libtype1.la \ - $(GLXMODS) -# $(XTRAPMOD) + $(GLXMODS) \ + $(XTRAPMOD) AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ @@ -105,11 +105,9 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c -# XXX NOTYET -# libxtrap_la_LDFLAGS = -avoid-version -# libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la -# libxtrap_la_SOURCES = xf86XTrapModule.c -EXTRA_DIST = xf86XTrapModule.c +libxtrap_la_LDFLAGS = -avoid-version +libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la +libxtrap_la_SOURCES = xf86XTrapModule.c xkb%.c: echo "#define XF86DDXACTIONS" > $@ |