Bug #4824: Build XTrap support by default, matching monolith.
This commit is contained in:
parent
627ac1fe1d
commit
d3b6653a28
|
@ -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:
|
||||
|
|
|
@ -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" > $@
|
||||
|
|
Loading…
Reference in New Issue
Block a user