andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #4824: Build XTrap support by default, matching monolith.

Browse Source
This commit is contained in:
Adam Jackson 2005-11-19 03:53:04 +00:00
parent 627ac1fe1d
commit d3b6653a28
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
* hw/xfree86/os-support/linux/Makefile.am: * hw/xfree86/os-support/linux/Makefile.am:
Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck) 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> 2005-11-16 Adam Jackson <ajax@freedesktop.org>
* configure.ac: * configure.ac:

18
hw/xfree86/dixmods/Makefile.am
View File

@ -6,9 +6,9 @@ if GLX
GLXMODS = libglx.la libGLcore.la GLXMODS = libglx.la libGLcore.la
endif endif
# if XTRAP if XTRAP
# XTRAPMOD = libxtrap.la XTRAPMOD = libxtrap.la
# endif endif
module_LTLIBRARIES = libafb.la \ module_LTLIBRARIES = libafb.la \
libbitmap.la \ libbitmap.la \
@ -24,8 +24,8 @@ module_LTLIBRARIES = libafb.la \
libshadow.la \ libshadow.la \
libfreetype.la \ libfreetype.la \
libtype1.la \ libtype1.la \
$(GLXMODS) $(GLXMODS) \
# $(XTRAPMOD) $(XTRAPMOD)
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
@ -105,11 +105,9 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
# XXX NOTYET libxtrap_la_LDFLAGS = -avoid-version
# libxtrap_la_LDFLAGS = -avoid-version libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la
# libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la libxtrap_la_SOURCES = xf86XTrapModule.c
# libxtrap_la_SOURCES = xf86XTrapModule.c
EXTRA_DIST = xf86XTrapModule.c
xkb%.c: xkb%.c:
echo "#define XF86DDXACTIONS" > $@ echo "#define XF86DDXACTIONS" > $@