symlink.sh:

New files linked:
xorgconf.cpp Options
usb.3 usb_hid_usages
lynx_ppc.S
BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S
sun_inout.s
xaaTEGlyphBlt.S
xkbcomp/compiled/README
New files excluded:
All of lib/GL/apple
xlibi18n/*/*.mapfile
xxserver/xorg/configure.ac, xkb/Makefile.am:
Install README.compiled in the xkb output dir
This commit is contained in:
Søren Sandmann Pedersen 2005-10-06 22:25:35 +00:00
parent 1614a31a9d
commit e4ed43c3a6
2 changed files with 15 additions and 1 deletions

View File

@ -1030,8 +1030,19 @@ dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers
AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
# Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
fi
AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
AC_SUBST(XKM_OUTPUT_DIR)
dnl and the rest of these are generic, so they're in config.h
AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])
AC_DEFINE(XF86BIGFONT, 1, [Build XFree86 BigFont extension])

View File

@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
AM_CFLAGS = $(DIX_CFLAGS) \
-DHAVE_XKB_CONFIG_H
DDX_SRCS = \
ddxBeep.c \
ddxCtrls.c \
@ -50,3 +50,6 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
EXTRA_DIST = xkb.h xkbDflts.h
xkbcompileddir = $(XKM_OUTPUT_DIR)
xkbcompiled_DATA = README.compiled