diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | XTrap/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/Makefile.am | 11 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-10-18 Adam Jackson <ajax@freedesktop.org> + + * XTrap/Makefile.am: + * hw/xfree86/dixmods/Makefile.am: + Move xf86XTrapModule.c to dixmods, guess at a build system. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/XTrap/Makefile.am b/XTrap/Makefile.am index 073c241c8..1eddd4f56 100644 --- a/XTrap/Makefile.am +++ b/XTrap/Makefile.am @@ -3,6 +3,3 @@ noinst_LTLIBRARIES = libxtrap.la AM_CFLAGS = $(DIX_CFLAGS) libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c - -# FIXME: Shouldn't this be used if we're to load xtrap as a module? -EXTRA_DIST = xf86XTrapModule.c diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index b648d69b3..f8aac1ee9 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -6,6 +6,10 @@ if GLX GLXMODS = libglx.la libGLcore.la endif +# if XTRAP +# XTRAPMOD = libxtrap.la +# endif + module_LTLIBRARIES = libafb.la \ libbitmap.la \ libcfb.la \ @@ -21,6 +25,7 @@ module_LTLIBRARIES = libafb.la \ libfreetype.la \ libtype1.la \ $(GLXMODS) +# $(XTRAPMOD) AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ @@ -100,6 +105,12 @@ 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 + xkb%.c: echo "#define XF86DDXACTIONS" > $@ echo "#include \"$(top_srcdir)/xkb/ddx$*.c\"" >> $@ |