fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-06 13:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable loadable i18n modules, making them configurable on the configure command line.

Browse source 
Clean up conditionals for XKB, XCMS, XLOCALEDIR
Create new lib directory for locale modules in ${X11_LIBDIR}/locale/lib. Add this to the default XLOCALEDIR search path.
Create separate X11_LOCALEDATADIR variable pointing at ${datadir}/X11/locale for installing locale data.
Split out xcms, xkb, xlibi18n sources from main xlib bits so they can be conditionally included more easily. Lots of source files have been moved with this step; the result seems like it might be easier to maintain.
Display message at end of configure script with selected options.
Fix manual building with cpp to add -traditional in cpprules.in. This isn't conditionalized at all, so it will break on systems not using GNU cpp.
This commit is contained in:
Keith Packard 2005-07-11 08:29:18 +00:00
parent b46cf0d879
commit 6e752ea120
87 changed files with 869 additions and 408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
ChangeLog
View file

@ -1,3 +1,119 @@
2005-07-11 Keith Packard <keithp@keithp.com>
* configure.ac:
* cpprules.in:
* man/Makefile.am:
* nls/C/Makefile.am:
* nls/Makefile.am:
* nls/armscii-8/Makefile.am:
* nls/en_US.UTF-8/Makefile.am:
* nls/georgian-academy/Makefile.am:
* nls/georgian-ps/Makefile.am:
* nls/ibm-cp1133/Makefile.am:
* nls/iscii-dev/Makefile.am:
* nls/isiri-3342/Makefile.am:
* nls/iso8859-1/Makefile.am:
* nls/iso8859-10/Makefile.am:
* nls/iso8859-11/Makefile.am:
* nls/iso8859-13/Makefile.am:
* nls/iso8859-14/Makefile.am:
* nls/iso8859-15/Makefile.am:
* nls/iso8859-2/Makefile.am:
* nls/iso8859-3/Makefile.am:
* nls/iso8859-4/Makefile.am:
* nls/iso8859-5/Makefile.am:
* nls/iso8859-6/Makefile.am:
* nls/iso8859-7/Makefile.am:
* nls/iso8859-8/Makefile.am:
* nls/iso8859-9/Makefile.am:
* nls/iso8859-9e/Makefile.am:
* nls/ja.JIS/Makefile.am:
* nls/ja.S90/Makefile.am:
* nls/ja.SJIS/Makefile.am:
* nls/ja.U90/Makefile.am:
* nls/ja/Makefile.am:
* nls/ja_JP.UTF-8/Makefile.am:
* nls/ko/Makefile.am:
* nls/ko_KR.UTF-8/Makefile.am:
* nls/koi8-c/Makefile.am:
* nls/koi8-r/Makefile.am:
* nls/koi8-u/Makefile.am:
* nls/microsoft-cp1251/Makefile.am:
* nls/microsoft-cp1255/Makefile.am:
* nls/microsoft-cp1256/Makefile.am:
* nls/mulelao-1/Makefile.am:
* nls/nokhchi-1/Makefile.am:
* nls/pt_BR.UTF-8/Makefile.am:
* nls/tatar-cyr/Makefile.am:
* nls/th_TH.UTF-8/Makefile.am:
* nls/th_TH/Makefile.am:
* nls/tscii-0/Makefile.am:
* nls/vi_VN.tcvn/Makefile.am:
* nls/vi_VN.viscii/Makefile.am:
* nls/zh_CN.UTF-8/Makefile.am:
* nls/zh_CN.gb18030/Makefile.am:
* nls/zh_CN.gbk/Makefile.am:
* nls/zh_CN/Makefile.am:
* nls/zh_HK.UTF-8/Makefile.am:
* nls/zh_HK.big5/Makefile.am:
* nls/zh_HK.big5hkscs/Makefile.am:
* nls/zh_TW.UTF-8/Makefile.am:
* nls/zh_TW.big5/Makefile.am:
* nls/zh_TW/Makefile.am:
* src/Makefile.am:
* src/xcms/.cvsignore:
* src/xcms/Makefile.am:
* src/xim_trans.c:
* src/xkb/.cvsignore:
* src/xkb/Makefile.am:
* src/xlibi18n/.cvsignore:
* src/xlibi18n/Makefile.am:
* src/xlibi18n/im/.cvsignore:
* src/xlibi18n/im/Makefile.am:
* src/xlibi18n/im/ximcp/.cvsignore:
* src/xlibi18n/im/ximcp/Makefile.am:
* src/xlibi18n/lc/.cvsignore:
* src/xlibi18n/lc/Makefile.am:
* src/xlibi18n/lc/Utf8/.cvsignore:
* src/xlibi18n/lc/Utf8/Makefile.am:
* src/xlibi18n/lc/def/.cvsignore:
* src/xlibi18n/lc/def/Makefile.am:
* src/xlibi18n/lc/gen/.cvsignore:
* src/xlibi18n/lc/gen/Makefile.am:
* src/xlibi18n/lc/xlocale/.cvsignore:
* src/xlibi18n/lc/xlocale/Makefile.am:
* src/xlibi18n/om/.cvsignore:
* src/xlibi18n/om/Makefile.am:
* src/xlibi18n/om/generic/.cvsignore:
* src/xlibi18n/om/generic/Makefile.am:
* src/xlibi18n/xim_trans.c:
Enable loadable i18n modules, making them
configurable on the configure command line.
Clean up conditionals for XKB, XCMS, XLOCALEDIR
Create new lib directory for locale modules
in ${X11_LIBDIR}/locale/lib. Add this to the
default XLOCALEDIR search path.
Create separate X11_LOCALEDATADIR variable
pointing at ${datadir}/X11/locale for
installing locale data.
Split out xcms, xkb, xlibi18n sources from
main xlib bits so they can be conditionally included
more easily. Lots of source files have been moved
with this step; the result seems like it might
be easier to maintain.
Display message at end of configure script with
selected options.
Fix manual building with cpp to add -traditional
in cpprules.in. This isn't conditionalized at all,
so it will break on systems not using GNU cpp.
2005-07-08 Keith Packard <keithp@keithp.com>
* .cvsignore:

121
configure.ac
View file

@ -44,6 +44,7 @@ XTRANS_CONNECTION_FLAGS
XTRANS_SECURE_RPC_FLAGS
# Check for dlopen
AC_MSG_CHECKING([if run-time linking is supported])
AC_SEARCH_LIBS(dlopen,[dl svld])
if test "x$ac_cv_search_dlopen" = xno; then
AC_SEARCH_LIBS(shl_load,[dld])
@ -57,10 +58,38 @@ else
AC_CHECK_HEADERS([dlfcn.h])
fi
if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then
HAVE_LOADABLE_MODULES=yes
else
HAVE_LOADABLE_MODULES=no
fi
AC_MSG_RESULT($HAVE_LOADABLE_MODULES)
AC_MSG_CHECKING([if loadable i18n module support should be enabled])
AC_ARG_ENABLE(loadable-i18n,
AC_HELP_STRING([--disable-loadable-i18n],
[Controls loadable i18n module support]),
[XLIB_LOADABLE_I18N=$enableval],
[XLIB_LOADABLE_I18N=$HAVE_LOADABLE_MODULES])
if test x$XLIB_LOADABLE_I18N = xyes; then
AC_DEFINE(USE_DYNAMIC_LC,1,
[Split some i18n functions into loadable modules])
fi
AC_MSG_RESULT($XLIB_LOADABLE_I18N)
AM_CONDITIONAL(XLIB_LOADABLE_I18N, test x$XLIB_LOADABLE_I18N = xyes)
AC_MSG_CHECKING([if loadable Xcursor library support should be enabled])
AC_ARG_ENABLE(loadable-xcursor,
AC_HELP_STRING([--disable-loadable-xcursor],
[Controls loadable xcursor library support]),
[XLIB_LOADABLE_XCURSOR=$enableval],
[XLIB_LOADABLE_XCURSOR=$HAVE_LOADABLE_MODULES])
if test x$XLIB_LOADABLE_XCURSOR = xyes; then
AC_DEFINE(USE_DYNAMIC_XCURSOR,1,
[Use the X cursor library to load cursors])
fi
AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)
# Checks for header files.
AC_HEADER_STDC
dnl AC_CHECK_HEADERS([stdio.h stdlib.h math.h])
@ -153,18 +182,26 @@ esac
AC_SUBST(KEYSYMDEF)
AM_CONDITIONAL(UDC, test xfalse = xtrue)
AM_CONDITIONAL(XCMS, test xtrue = xtrue)
AC_ARG_ENABLE(xcms,
AC_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
[XCMS=$enableval],[XCMS=yes])
AM_CONDITIONAL(XCMS, [test x$XCMS = xyes ])
if test x"$XCMS" = "xyes"; then
AC_DEFINE(XCMS,1,[Include support for XCMS])
fi
AC_ARG_ENABLE(xlocale,
AC_HELP_STRING([--disable-xlocale],
[Disable Xlib locale implementation *EXPERIMENTAL*]),
[XLOCALE=$enableval],[XLOCALE=yes])
AM_CONDITIONAL(XLOCALE, [ test x$XLOCALE = xyes ])
if test x"$XLOCALE" = "xyes"; then
AC_DEFINE(XLOCALE,1,[support for X Locales])
fi
# This disables XLOCALEDIR. Set it if you're using BuildLoadableXlibI18n,
# don't have either issetugid() or getresuid(), and you need to protect
# clients that are setgid or setuid to an id other than 0.
@ -172,25 +209,20 @@ AC_MSG_CHECKING([if XLOCALEDIR support should be enabled])
AC_ARG_ENABLE(xlocaledir,
AC_HELP_STRING([--enable-xlocaledir],
[Enable XLOCALEDIR environment variable support]),
[XLOCALEDIR=$enableval],[XLOCALEDIR=$XLOCALEDIR_IS_SAFE])
if test "x$XLOCALEDIR" == "xno"; then
[ENABLE_XLOCALEDIR=$enableval],[ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE])
if test "x$ENABLE_XLOCALEDIR" == "xno"; then
AC_DEFINE(NO_XLOCALEDIR,1,[Disable XLOCALEDIR environment variable])
fi
AC_MSG_RESULT($XLOCALEDIR)
AC_MSG_RESULT($ENABLE_XLOCALEDIR)
AC_ARG_ENABLE(xf86bigfont,
AC_HELP_STRING([--disable-xf86bigfont],
[Disable XF86BigFont extension support]),
[XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
if test "x$XF86BIGFONT" == "xyes"; then
if test "x$XF86BIGFONT" = "xyes"; then
PKG_CHECK_MODULES(BIGFONTPROTO, xf86bigfontproto,
AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension])
X11_CFLAGS="$X11_CFLAGS $BIGFONTPROTO_CFLAGS"
X11_LIBS="$X11_LIBS $BIGFONTPROTO_CFLAGS",
XF86BIGFONT="no")
AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension]),XF86BIGFONT="no")
fi
AC_MSG_RESULT($XF86BIGFONT)
AC_ARG_ENABLE(xkb,
AC_HELP_STRING([--disable-xkb],
@ -201,24 +233,19 @@ AC_ARG_ENABLE(man-pages,
AC_HELP_STRING([--enable-man-pages=section],
[Choose manual section for installing man pages]),
[LIBMAN_SUFFIX=$enableval],[LIBMAN_SUFFIX=3x])
if test "x$LIBMAN_SUFFIX" = "xyes"; then
LIBMAN_SUFFIX=3x
fi
AC_SUBST(LIBMAN_SUFFIX)
# Finalization
AM_CONDITIONAL(DISABLE_XCMS, [test x$XCMS = xno ])
if test "$XCMS" = no; then
AC_DEFINE(DISABLE_XCMS,1,[No support for XCMS])
fi
AM_CONDITIONAL(DISABLE_XLOCALE, [ test x$XLOCALE = xno ])
if test "$XLOCALE" = no; then
AC_DEFINE(DISABLE_XLOCALE,1,[No support for X Locales])
fi
AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN_SUFFIX '!=' xno ])
AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
if test "$XKB" = yes; then
if test x"$XKB" = "xyes"; then
PKG_CHECK_MODULES(XKBPROTO, kbproto inputproto)
AC_DEFINE(XKB, YES, [Use XKB])
AC_DEFINE(XKB,1,[Use XKB])
X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS"
X11_LIBS="$X11_LIBS $XKBPROTO_LIBS"
fi
@ -231,12 +258,27 @@ if test "x$GCC" = "xyes"; then
fi
X11_DATADIR="${datadir}/X11"
X11_LOCALEDIR="${X11_DATADIR}/locale"
X11_LIBDIR="${libdir}/X11"
#
# Yes, it would be nice to put the locale data in
# /usr/share, but the locale stuff includes loadable
# libraries which must be located in the same directory
# as the other locale data, so for now, everything lives
# in ${libdir}
#
X11_LOCALEDATADIR="${X11_LIBDIR}/locale"
X11_LOCALELIBDIR="${X11_LIBDIR}/locale/lib"
X11_LOCALEDIR="${X11_LOCALEDATADIR}"
XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
XERRORDB="${X11_DATADIR}/XErrorDB"
AC_SUBST(X11_DATADIR)
AC_SUBST(X11_LOCALEDIR)
AC_SUBST(X11_LIBDIR)
AC_SUBST(X11_LOCALEDATADIR)
AC_SUBST(X11_LOCALELIBDIR)
AC_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
@ -246,6 +288,18 @@ AC_OUTPUT([Makefile
man/Makefile
src/Makefile
src/util/Makefile
src/xcms/Makefile
src/xlibi18n/Makefile
src/xlibi18n/im/Makefile
src/xlibi18n/im/ximcp/Makefile
src/xlibi18n/lc/Makefile
src/xlibi18n/lc/def/Makefile
src/xlibi18n/lc/gen/Makefile
src/xlibi18n/lc/Utf8/Makefile
src/xlibi18n/lc/xlocale/Makefile
src/xlibi18n/om/Makefile
src/xlibi18n/om/generic/Makefile
src/xkb/Makefile
nls/Makefile
nls/armscii-8/Makefile
nls/C/Makefile
@ -304,3 +358,16 @@ AC_OUTPUT([Makefile
nls/zh_TW.big5/Makefile
nls/zh_TW.UTF-8/Makefile
x11.pc])
echo ""
echo "X11 will be built with the following settings:"
echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
echo " Loadable xcursory library support: "$XLIB_LOADABLE_XCURSOR
echo " Threading support: "$xthreads
echo " XCMS: "$XCMS
echo " Internationalization support: "$XLOCALE
echo " XF86BigFont support: "$XF86BIGFONT
echo " XKB support: "$XKB
echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
echo " Manual pages installed: "$LIBMAN_SUFFIX
echo ""

4
cpprules.in
View file

@ -10,6 +10,8 @@ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
RAWCPPFLAGS = -traditional
# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
# to cpp, because that trick does not work on all ANSI C preprocessors.
# Delete line numbers from the cpp output (-P is not portable, I guess).
@ -25,4 +27,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/\@\@$$/s/\@\@$$/\\/'
.pre:
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@

4
man/Makefile.am
View file

@ -4,6 +4,7 @@
LIBMANSUFFIX=@LIBMAN_SUFFIX@
libmandir = $(mandir)/man$(LIBMANSUFFIX)
if MANPAGES
libman_SOURCES = \
AllPlanes.man \
BlackPixelOfScreen.man \
@ -186,8 +187,9 @@ libman_SOURCES = \
XmbTextEscapement.man \
XmbTextExtents.man \
XmbTextPerCharExtents.man
endif
libman_DATA=$(libman_SOURCES:man=$(LIBMANSUFFIX))
libman_DATA=$(libman_SOURCES:man=$(LIBMAN_SUFFIX))
EXTRA_DIST = $(libman_SOURCES)

2
modules/im/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in

1
modules/im/Makefile.am Normal file
View file

@ -0,0 +1 @@
SUBDIRS=ximcp

7
modules/im/ximcp/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

45
modules/im/ximcp/Makefile.am Normal file
View file

@ -0,0 +1,45 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=ximcp.la
ximcp_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES=libximcp.la
endif
ximcp_la_SOURCES = \
imCallbk.c \
imDefFlt.c \
imDefIc.c \
imDefIm.c \
imDefLkup.c \
imDispch.c \
imEvToWire.c \
imExten.c \
imImSw.c \
imInsClbk.c \
imInt.c \
imLcFlt.c \
imLcGIc.c \
imLcIc.c \
imLcIm.c \
imLcLkup.c \
imLcPrs.c \
imLcSIc.c \
imRmAttr.c \
imRm.c \
imThaiFlt.c \
imThaiIc.c \
imThaiIm.c \
imTrans.c \
imTransR.c \
imTrX.c
libximcp_la_SOURCES = $(ximcp_la_SOURCES)

2
modules/lc/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in

1
modules/lc/Makefile.am Normal file
View file

@ -0,0 +1 @@
SUBDIRS=Utf8 def gen xlocale

7
modules/lc/Utf8/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

20
modules/lc/Utf8/Makefile.am Normal file
View file

@ -0,0 +1,20 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlcUTF8Load.la
xlcUTF8Load_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES = libxlcUTF8Load.la
endif
xlcUTF8Load_la_SOURCES = \
lcUTF8Load.c
libxlcUTF8Load_la_SOURCES = $(xlcUTF8Load_la_SOURCES)

7
modules/lc/def/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

19
modules/lc/def/Makefile.am Normal file
View file

@ -0,0 +1,19 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlcDef.la
xlcDef_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES = libxlcDef.la
endif
xlcDef_la_SOURCES = \
lcDefConv.c
libxlcDef_la_SOURCES = $(xlcDef_la_SOURCES)

7
modules/lc/gen/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

19
modules/lc/gen/Makefile.am Normal file
View file

@ -0,0 +1,19 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlibi18n.la
xlibi18n_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES = libxlibi18n.la
endif
xlibi18n_la_SOURCES = \
lcGenConv.c
libxlibi18n_la_SOURCES = $(xlibi18n_la_SOURCES)

7
modules/lc/xlocale/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

22
modules/lc/xlocale/Makefile.am Normal file
View file

@ -0,0 +1,22 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlocale.la
xlocale_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES = libxlocale.la
endif
xlocale_la_SOURCES = \
lcEuc.c
lcJis.c
lcSjis.c
libxlocale_la_SOURCES = $(xlocale_la_SOURCES)

2
modules/om/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in

1
modules/om/Makefile.am Normal file
View file

@ -0,0 +1 @@
SUBDIRS=generic

7
modules/om/generic/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

27
modules/om/generic/Makefile.am Normal file
View file

@ -0,0 +1,27 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xomGeneric.la
xomGeneric_la_LDFLAGS = -module -version-number 2:0:0
else
noinst_LTLIBRARIES = libxomGeneric.la
endif
xomGeneric_la_SOURCES = \
omDefault.c \
omGeneric.c \
omImText.c \
omText.c \
omTextEsc.c \
omTextExt.c \
omTextPer.c \
omXChar.c
libxomGeneric_la_SOURCES = $(xomGeneric_la_SOURCES)

2
nls/C/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/C
x11thislocaledir = @X11_LOCALEDATADIR@/C
include $(top_srcdir)/nls/localerules.in

2
nls/Makefile.am
View file

@ -1,4 +1,4 @@
x11localedir = @X11_LOCALEDIR@
x11localedir = @X11_LOCALEDATADIR@
EXTRA_DIST = locale.alias.pre compose.dir.pre

2
nls/armscii-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/armscii-8
x11thislocaledir = @X11_LOCALEDATADIR@/armscii-8
include $(top_srcdir)/nls/localerules.in

2
nls/en_US.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/en_US.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/en_US.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/georgian-academy/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/georgian-academy
x11thislocaledir = @X11_LOCALEDATADIR@/georgian-academy
include $(top_srcdir)/nls/localerules.in

2
nls/georgian-ps/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/georgian-ps
x11thislocaledir = @X11_LOCALEDATADIR@/georgian-ps
include $(top_srcdir)/nls/localerules.in

2
nls/ibm-cp1133/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ibm-cp1133
x11thislocaledir = @X11_LOCALEDATADIR@/ibm-cp1133
include $(top_srcdir)/nls/localerules.in

2
nls/iscii-dev/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iscii-dev
x11thislocaledir = @X11_LOCALEDATADIR@/iscii-dev
include $(top_srcdir)/nls/localerules.in

2
nls/isiri-3342/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/isiri-3342
x11thislocaledir = @X11_LOCALEDATADIR@/isiri-3342
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-1/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-1
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-1
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-10/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-10
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-10
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-11/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-11
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-11
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-13/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-13
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-13
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-14/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-14
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-14
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-15/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-15
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-15
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-2/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-2
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-2
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-3/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-3
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-3
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-4/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-4
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-4
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-5/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-5
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-5
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-6/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-6
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-6
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-7/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-7
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-7
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-8
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-8
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-9/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-9
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-9
include $(top_srcdir)/nls/localerules.in

2
nls/iso8859-9e/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/iso8859-9e
x11thislocaledir = @X11_LOCALEDATADIR@/iso8859-9e
include $(top_srcdir)/nls/localerules.in

2
nls/ja.JIS/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja.JIS
x11thislocaledir = @X11_LOCALEDATADIR@/ja.JIS
include $(top_srcdir)/nls/localerules.in

2
nls/ja.S90/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja.S90
x11thislocaledir = @X11_LOCALEDATADIR@/ja.S90
include $(top_srcdir)/nls/localerules.in

2
nls/ja.SJIS/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja.SJIS
x11thislocaledir = @X11_LOCALEDATADIR@/ja.SJIS
include $(top_srcdir)/nls/localerules.in

2
nls/ja.U90/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja.U90
x11thislocaledir = @X11_LOCALEDATADIR@/ja.U90
include $(top_srcdir)/nls/localerules.in

2
nls/ja/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja
x11thislocaledir = @X11_LOCALEDATADIR@/ja
include $(top_srcdir)/nls/localerules.in

2
nls/ja_JP.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ja_JP.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/ja_JP.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/ko/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ko
x11thislocaledir = @X11_LOCALEDATADIR@/ko
include $(top_srcdir)/nls/localerules.in

2
nls/ko_KR.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/ko_KR.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/ko_KR.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/koi8-c/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/koi8-c
x11thislocaledir = @X11_LOCALEDATADIR@/koi8-c
include $(top_srcdir)/nls/localerules.in

2
nls/koi8-r/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/koi8-r
x11thislocaledir = @X11_LOCALEDATADIR@/koi8-r
include $(top_srcdir)/nls/localerules.in

2
nls/koi8-u/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/koi8-u
x11thislocaledir = @X11_LOCALEDATADIR@/koi8-u
include $(top_srcdir)/nls/localerules.in

2
nls/microsoft-cp1251/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1251
x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1251
include $(top_srcdir)/nls/localerules.in

2
nls/microsoft-cp1255/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1255
x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1255
include $(top_srcdir)/nls/localerules.in

2
nls/microsoft-cp1256/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/microsoft-cp1256
x11thislocaledir = @X11_LOCALEDATADIR@/microsoft-cp1256
include $(top_srcdir)/nls/localerules.in

2
nls/mulelao-1/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/mulelao-1
x11thislocaledir = @X11_LOCALEDATADIR@/mulelao-1
include $(top_srcdir)/nls/localerules.in

2
nls/nokhchi-1/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/nokhchi-1
x11thislocaledir = @X11_LOCALEDATADIR@/nokhchi-1
include $(top_srcdir)/nls/localerules.in

2
nls/pt_BR.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/pt_BR.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/pt_BR.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/tatar-cyr/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/tatar-cyr
x11thislocaledir = @X11_LOCALEDATADIR@/tatar-cyr
include $(top_srcdir)/nls/localerules.in

2
nls/th_TH.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/th_TH.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/th_TH.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/th_TH/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/th_TH
x11thislocaledir = @X11_LOCALEDATADIR@/th_TH
include $(top_srcdir)/nls/localerules.in

2
nls/tscii-0/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/tscii-0
x11thislocaledir = @X11_LOCALEDATADIR@/tscii-0
include $(top_srcdir)/nls/localerules.in

2
nls/vi_VN.tcvn/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/vi_VN.tcvn
x11thislocaledir = @X11_LOCALEDATADIR@/vi_VN.tcvn
include $(top_srcdir)/nls/localerules.in

2
nls/vi_VN.viscii/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/vi_VN.viscii
x11thislocaledir = @X11_LOCALEDATADIR@/vi_VN.viscii
include $(top_srcdir)/nls/localerules.in

2
nls/zh_CN.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_CN.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/zh_CN.gb18030/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_CN.gb18030
x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.gb18030
include $(top_srcdir)/nls/localerules.in

2
nls/zh_CN.gbk/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_CN.gbk
x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN.gbk
include $(top_srcdir)/nls/localerules.in

2
nls/zh_CN/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_CN
x11thislocaledir = @X11_LOCALEDATADIR@/zh_CN
include $(top_srcdir)/nls/localerules.in

2
nls/zh_HK.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_HK.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/zh_HK.big5/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_HK.big5
x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.big5
include $(top_srcdir)/nls/localerules.in

2
nls/zh_HK.big5hkscs/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_HK.big5hkscs
x11thislocaledir = @X11_LOCALEDATADIR@/zh_HK.big5hkscs
include $(top_srcdir)/nls/localerules.in

2
nls/zh_TW.UTF-8/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_TW.UTF-8
x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW.UTF-8
include $(top_srcdir)/nls/localerules.in

2
nls/zh_TW.big5/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_TW.big5
x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW.big5
include $(top_srcdir)/nls/localerules.in

2
nls/zh_TW/Makefile.am
View file

@ -1,3 +1,3 @@
x11thislocaledir = @X11_LOCALEDIR@/zh_TW
x11thislocaledir = @X11_LOCALEDATADIR@/zh_TW
include $(top_srcdir)/nls/localerules.in

480
src/Makefile.am
View file

@ -1,271 +1,122 @@
SUBDIRS=util
SUBDIRS=util xcms xlibi18n xkb
lib_LTLIBRARIES=libX11.la
BUILT_SOURCES=ks_tables.h
CLEANFILES=ks_tables.h ks_tables_h
AM_CFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
-I$(top_builddir)/include/X11 \
$(X11_CFLAGS) \
$(BIGREQS_CFLAGS) \
$(XDMCP_CFLAGS) \
-DX11_DATADIR='"@X11_DATADIR@"' \
-D_BSD_SOURCE
AM_CFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
-I$(top_builddir)/include \
-I$(top_builddir)/include/X11 \
-I$(top_srcdir)/src/xcms \
-I$(top_srcdir)/src/xkb \
-I$(top_srcdir)/src/xlibi18n \
$(X11_CFLAGS) \
$(BIGREQS_CFLAGS) \
$(BIGFONT_CFLAGS) \
$(XDMCP_CFLAGS) \
-D_BSD_SOURCE
libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined
#
# =============================== I18N =============================
#
libX11_la_LIBADD = $(X11_LIBS) $(BIGREQS_LIBS) $(XDMCP_LIBS)
I18N_LIBS = \
xlibi18n/libi18n.la
XCMS_SRCS= \
AddDIC.c \
AddSF.c \
CCC.c \
CvColW.c \
CvCols.c \
Cv.h \
HVC.c \
HVCGcC.c \
HVCGcV.c \
HVCGcVC.c \
HVCMnV.c \
HVCMxC.c \
HVCMxV.c \
HVCMxVC.c \
HVCMxVs.c \
HVCWpAj.c \
IdOfPr.c \
LRGB.c \
Lab.c \
LabGcC.c \
LabGcL.c \
LabGcLC.c \
LabMnL.c \
LabMxC.c \
LabMxL.c \
LabMxLC.c \
LabWpAj.c \
Luv.c \
LuvGcC.c \
LuvGcL.c \
LuvGcLC.c \
LuvMnL.c \
LuvMxC.c \
LuvMxL.c \
LuvMxLC.c \
LuvWpAj.c \
OfCCC.c \
PrOfId.c \
QBlack.c \
QBlue.c \
QGreen.c \
QRed.c \
QWhite.c \
QuCol.c \
QuCols.c \
SetCCC.c \
SetGetCols.c \
StCol.c \
StCols.c \
UNDEFINED.c \
XRGB.c \
XYZ.c \
cmsAllCol.c \
cmsAllNCol.c \
cmsCmap.c \
cmsColNm.c \
cmsGlobls.c \
cmsInt.c \
cmsLkCol.c \
cmsMath.c \
cmsProp.c \
cmsTrig.c \
uvY.c \
xyY.c \
Xcmsint.h
#
# =============================== XCMS =============================
#
XI18N_SRCS=\
xim_trans.c \
ICWrap.c \
IMWrap.c \
XDefaultIMIF.c \
XDefaultOMIF.c \
XlcDL.c \
XlcSL.c \
imCallbk.c \
imConv.c \
imDefFlt.c \
imDefIc.c \
imDefIm.c \
imDefLkup.c \
imDispch.c \
imEvToWire.c \
imExten.c \
imImSw.c \
imInsClbk.c \
imInt.c \
imKStoUCS.c \
imLcFlt.c \
imLcGIc.c \
imLcIc.c \
imLcIm.c \
imLcLkup.c \
imLcPrs.c \
imLcSIc.c \
imRm.c \
imRmAttr.c \
imThaiFlt.c \
imThaiIc.c \
imThaiIm.c \
imTrX.c \
imTrans.c \
imTransR.c \
lcCT.c \
lcCharSet.c \
lcConv.c \
lcDB.c \
lcDefConv.c \
lcDynamic.c \
lcEuc.c \
lcFile.c \
lcGenConv.c \
lcGeneric.c \
lcInit.c \
lcJis.c \
lcPrTxt.c \
lcPubWrap.c \
lcPublic.c \
lcRM.c \
lcSjis.c \
lcStd.c \
lcTxtPr.c \
lcUTF8.c \
lcUTF8Load.c \
lcUtil.c \
lcWrap.c \
mbWMProps.c \
mbWrap.c \
omDefault.c \
omGeneric.c \
omImText.c \
omText.c \
omTextEsc.c \
omTextExt.c \
omTextPer.c \
omXChar.c \
utf8WMProps.c \
utf8Wrap.c \
wcWrap.c \
Xaixlcint.h \
XimImSw.h \
XimProto.h \
XimThai.h \
XimTrInt.h \
XimTrX.h \
XimTrans.h \
Ximint.h \
XimintL.h \
XimintP.h \
XlcGeneric.h \
XlcPubI.h \
XlcPublic.h \
Xlcint.h \
lcUniConv/armscii_8.h \
lcUniConv/ascii.h \
lcUniConv/big5.h \
lcUniConv/big5_emacs.h \
lcUniConv/cp1133.h \
lcUniConv/cp1251.h \
lcUniConv/cp1255.h \
lcUniConv/cp1256.h \
lcUniConv/gb2312.h \
lcUniConv/georgian_academy.h \
lcUniConv/georgian_ps.h \
lcUniConv/iso8859_1.h \
lcUniConv/iso8859_10.h \
lcUniConv/iso8859_11.h \
lcUniConv/iso8859_13.h \
lcUniConv/iso8859_14.h \
lcUniConv/iso8859_15.h \
lcUniConv/iso8859_16.h \
lcUniConv/iso8859_2.h \
lcUniConv/iso8859_3.h \
lcUniConv/iso8859_4.h \
lcUniConv/iso8859_5.h \
lcUniConv/iso8859_6.h \
lcUniConv/iso8859_7.h \
lcUniConv/iso8859_8.h \
lcUniConv/iso8859_9.h \
lcUniConv/iso8859_9e.h \
lcUniConv/jisx0201.h \
lcUniConv/jisx0208.h \
lcUniConv/jisx0212.h \
lcUniConv/koi8_c.h \
lcUniConv/koi8_r.h \
lcUniConv/koi8_u.h \
lcUniConv/ksc5601.h \
lcUniConv/mulelao.h \
lcUniConv/tatar_cyr.h \
lcUniConv/tcvn.h \
lcUniConv/tis620.h \
lcUniConv/ucs2be.h \
lcUniConv/utf8.h \
lcUniConv/viscii.h
XCMS_LIBS = \
xcms/libxcms.la
X11_SRCS= \
#
# =============================== XKB ==============================
#
XKB_LIBS = \
xkb/libxkb.la
#
# =============================== XLIB =============================
#
libX11_la_SOURCES = \
AllCells.c \
AllowEv.c \
AllPlanes.c \
AutoRep.c \
Backgnd.c \
BdrWidth.c \
Bell.c \
Border.c \
ChAccCon.c \
ChActPGb.c \
ChClMode.c \
ChCmap.c \
ChGC.c \
ChKeyCon.c \
ChProp.c \
ChWAttrs.c \
ChkIfEv.c \
ChkMaskEv.c \
ChkTypEv.c \
ChkTypWEv.c \
ChkWinEv.c \
ChPntCon.c \
ChProp.c \
ChSaveSet.c \
ChWAttrs.c \
ChWindow.c \
CirWin.c \
CirWinDn.c \
CirWinUp.c \
ClDisplay.c \
ClearArea.c \
Clear.c \
Cmap.h \
ConfWind.c \
ConnDis.c \
Context.c \
ConvSel.c \
CopyArea.c \
CopyCmap.c \
CopyGC.c \
CopyPlane.c \
CrBFData.c \
CrCmap.c \
CrCursor.c \
CrGC.c \
CrGlCur.c \
Cr.h \
CrPFBData.c \
ChSaveSet.c \
CrPixmap.c \
CrWindow.c \
Cursor.c \
DefCursor.c \
DelProp.c \
Depths.c \
DestSubs.c \
DestWind.c \
DisName.c \
DrArc.c \
DrArcs.c \
DrLine.c \
DrLines.c \
DrPoint.c \
DrPoints.c \
DrRect.c \
DrRects.c \
DrSegs.c \
ErrDes.c \
ErrHndlr.c \
evtomask.c \
EvToWire.c \
FSSaver.c \
FSWrap.c \
FetchName.c \
FillArc.c \
FillArcs.c \
FillPoly.c \
FillRct.c \
FillRcts.c \
FilterEv.c \
@ -273,8 +124,14 @@ X11_SRCS= \
Font.c \
FontInfo.c \
FontNames.c \
FreeCmap.c \
FreeCols.c \
FreeCurs.c \
FreeEData.c \
FreeGC.c \
FreePix.c \
FSSaver.c \
FSWrap.c \
GCMisc.c \
Geom.c \
GetAtomNm.c \
@ -302,30 +159,44 @@ X11_SRCS= \
GetWAttrs.c \
GetWMCMapW.c \
GetWMProto.c \
globals.c \
GrButton.c \
GrKeybd.c \
GrKey.c \
GrPointer.c \
GrServer.c \
Host.c \
Iconify.c \
IfEvent.c \
ImText.c \
imConv.c \
ImText16.c \
ImText.c \
ImUtil.c \
InitExt.c \
InsCmap.c \
IntAtom.c \
KeyBind.c \
Key.h \
KeysymStr.c \
KillCl.c \
LiHosts.c \
LiICmaps.c \
LiProps.c \
ListExt.c \
LoadFont.c \
LockDis.c \
locking.c \
locking.h \
LookupCol.c \
LowerWin.c \
Macros.c \
MapRaised.c \
MapSubs.c \
MapWindow.c \
MaskEvent.c \
Misc.c \
ModMap.c \
MoveWin.c \
NextEvent.c \
OCWrap.c \
OMWrap.c \
@ -337,13 +208,16 @@ X11_SRCS= \
PeekIfEv.c \
Pending.c \
PixFormats.c \
PmapBgnd.c \
PmapBord.c \
poly.h \
PolyReg.c \
PolyTxt.c \
PolyTxt16.c \
PolyTxt.c \
PropAlloc.c \
PutBEvent.c \
PutImage.c \
Quarks.c \
QuBest.c \
QuColor.c \
QuColors.c \
@ -356,135 +230,62 @@ X11_SRCS= \
QuTextExt.c \
QuTileShp.c \
QuTree.c \
Quarks.c \
RaiseWin.c \
RdBitF.c \
RecolorC.c \
ReconfWM.c \
ReconfWin.c \
ReconfWM.c \
Region.c \
RegstFlt.c \
RepWindow.c \
RestackWs.c \
RotProp.c \
ScrResStr.c \
SelInput.c \
SendEvent.c \
SetBack.c \
SetCRects.c \
SetClMask.c \
SetClOrig.c \
SetCRects.c \
SetDashes.c \
SetFPath.c \
SetFont.c \
SetFore.c \
SetFPath.c \
SetFunc.c \
SetHints.c \
SetLStyle.c \
SetIFocus.c \
SetLocale.c \
SetLStyle.c \
SetNrmHint.c \
SetPMask.c \
SetPntMap.c \
SetRGBCMap.c \
SetStCmap.c \
SetSOwner.c \
SetSSaver.c \
SetState.c \
SetStCmap.c \
SetStip.c \
SetTSOrig.c \
SetTile.c \
SetTSOrig.c \
SetTxtProp.c \
SetWMCMapW.c \
SetWMProto.c \
StBytes.c \
StColor.c \
StColors.c \
StNColor.c \
StName.c \
StNColor.c \
StrKeysym.c \
StrToText.c \
Sync.c \
Synchro.c \
Text.c \
Text16.c \
TextExt.c \
Text.c \
TextExt16.c \
TextExt.c \
TextToStr.c \
TrCoords.c \
UndefCurs.c \
VisUtil.c \
WMGeom.c \
WMProps.c \
WinEvent.c \
Window.c \
Withdraw.c \
WrBitF.c \
XlibAsync.c \
XlibInt.c \
Xrm.c \
evtomask.c \
globals.c \
locking.c \
Cr.h \
Key.h \
Xatomtype.h \
Xintatom.h \
Xintconn.h \
XomGeneric.h \
Xresinternal.h \
XrmI.h \
locking.h \
poly.h
x11datadir = @X11_DATADIR@
x11data_DATA = XKeysymDB XErrorDB
EXTRA_DIST = \
$(X11_SRCS) \
$(XI18N_SRCS) \
$(XCMS_SRCS) \
$(x11data_DATA)
libX11_la_SOURCES = $(X11_SRCS)
libX11_la_SOURCES += \
ConnDis.c \
LockDis.c \
AllowEv.c \
Backgnd.c \
Bell.c \
ChActPGb.c \
ChClMode.c \
ChPntCon.c \
ChWindow.c \
Clear.c \
ClearArea.c \
ConfWind.c \
ConvSel.c \
CopyArea.c \
CopyPlane.c \
CrPixmap.c \
DefCursor.c \
DelProp.c \
DestSubs.c \
DestWind.c \
DrLine.c \
DrPoint.c \
FillPoly.c \
FreeCmap.c \
FreeCols.c \
FreeCurs.c \
FreePix.c \
GrButton.c \
GrKey.c \
GrServer.c \
InsCmap.c \
KillCl.c \
MapSubs.c \
MapWindow.c \
MoveWin.c \
PmapBgnd.c \
RepWindow.c \
SelInput.c \
SetIFocus.c \
SetSOwner.c \
SetSSaver.c \
UngrabBut.c \
UngrabKbd.c \
UngrabKey.c \
@ -494,22 +295,28 @@ libX11_la_SOURCES += \
UnldFont.c \
UnmapSubs.c \
UnmapWin.c \
VisUtil.c \
WarpPtr.c \
x11_trans.c
Window.c \
WinEvent.c \
Withdraw.c \
WMGeom.c \
WMProps.c \
WrBitF.c \
x11_trans.c \
Xatomtype.h \
Xintatom.h \
Xintconn.h \
XlibAsync.c \
XlibInt.c \
XomGeneric.h \
Xresinternal.h \
Xrm.c \
XrmI.h
if DISABLE_XLOCALE
libX11_la_SOURCES+= #X18NCMSstubs.c
else
libX11_la_SOURCES+= $(XI18N_SRCS)
endif
if DISABLE_XCMS
if !DISABLE_XLOCALE
libX11_la_SOURCES+= #X18NCMSstubs.c
endif
else
libX11_la_SOURCES+= $(XCMS_SRCS)
endif
#
# ========================= Extra stuff ============================
#
if OS2
libX11_la_SOURCES+=os2Stubs.c
@ -519,19 +326,48 @@ if UDC
libX11_la_SOURCES+=udcInf.c
endif
x11datadir = @X11_DATADIR@
x11data_DATA = XKeysymDB XErrorDB
EXTRA_DIST = \
$(x11data_DATA) \
os2Stubs.c \
udcInf.c
#
# Figure out which sub-libraries to link into Xlib
#
if XLOCALE
USE_I18N_LIBS = $(I18N_LIBS)
endif
if XCMS
USE_XCMS_LIBS = $(XCMS_LIBS)
endif
if XKB
libX11_la_SOURCES+=XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \
XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \
XKBList.c XKBMisc.c \
XKBMAlloc.c XKBGAlloc.c XKBAlloc.c \
XKBlibint.h
endif XKB
USE_XKB_LIBS = $(XKB_LIBS)
endif
libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined
libX11_la_LIBADD = \
$(USE_I18N_LIBS) \
$(USE_XCMS_LIBS) \
$(USE_XKB_LIBS) \
$(X11_LIBS) \
$(BIGREQS_LIBS) \
$(XDMCP_LIBS)
preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
.c.ii:
$(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
#
# Building ks_tables.h requires the makekeys utility
#
KEYSYMDEF=@KEYSYMDEF@
ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)

7
src/xcms/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

68
src/xcms/Makefile.am Normal file
View file

@ -0,0 +1,68 @@
noinst_LTLIBRARIES = libxcms.la
libxcms_la_SOURCES = \
AddDIC.c \
AddSF.c \
CCC.c \
CvColW.c \
CvCols.c \
Cv.h \
HVC.c \
HVCGcC.c \
HVCGcV.c \
HVCGcVC.c \
HVCMnV.c \
HVCMxC.c \
HVCMxV.c \
HVCMxVC.c \
HVCMxVs.c \
HVCWpAj.c \
IdOfPr.c \
LRGB.c \
Lab.c \
LabGcC.c \
LabGcL.c \
LabGcLC.c \
LabMnL.c \
LabMxC.c \
LabMxL.c \
LabMxLC.c \
LabWpAj.c \
Luv.c \
LuvGcC.c \
LuvGcL.c \
LuvGcLC.c \
LuvMnL.c \
LuvMxC.c \
LuvMxL.c \
LuvMxLC.c \
LuvWpAj.c \
OfCCC.c \
PrOfId.c \
QBlack.c \
QBlue.c \
QGreen.c \
QRed.c \
QWhite.c \
QuCol.c \
QuCols.c \
SetCCC.c \
SetGetCols.c \
StCol.c \
StCols.c \
UNDEFINED.c \
XRGB.c \
XYZ.c \
cmsAllCol.c \
cmsAllNCol.c \
cmsCmap.c \
cmsColNm.c \
cmsGlobls.c \
cmsInt.c \
cmsLkCol.c \
cmsMath.c \
cmsProp.c \
cmsTrig.c \
uvY.c \
xyY.c \
Xcmsint.h

7
src/xkb/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

28
src/xkb/Makefile.am Normal file
View file

@ -0,0 +1,28 @@
INCLUDES = \
-I${top_srcdir}/src/xlibi18n
noinst_LTLIBRARIES = libxkb.la
libxkb_la_SOURCES = \
XKB.c \
XKBBind.c \
XKBCompat.c \
XKBCtrls.c \
XKBCvt.c \
XKBGetMap.c \
XKBGetByName.c \
XKBNames.c \
XKBRdBuf.c \
XKBSetMap.c \
XKBUse.c \
XKBleds.c \
XKBBell.c \
XKBGeom.c \
XKBSetGeom.c \
XKBExtDev.c \
XKBList.c \
XKBMisc.c \
XKBMAlloc.c \
XKBGAlloc.c \
XKBAlloc.c \
XKBlibint.h

7
src/xlibi18n/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

118
src/xlibi18n/Makefile.am Normal file
View file

@ -0,0 +1,118 @@
SUBDIRS=im lc om
noinst_LTLIBRARIES = libi18n.la
#
# Dynamic loading code for i18n modules
#
if XLIB_LOADABLE_I18N
XI18N_DL_SOURCES = \
XlcDL.c \
XlcSL.c
else
#
# Static interfaces to input/output methods
#
IM_LIBS = \
im/ximcp/libximcp.la
LC_LIBS = \
lc/def/libxlcDef.la \
lc/gen/libxlibi18n.la \
lc/Utf8/libxlcUTF8Load.la \
lc/xlocale/libxlocale.la
OM_LIBS = \
om/generic/libxomGeneric.la
endif
libi18n_la_LIBADD = \
$(IM_LIBS) $(LC_LIBS) $(OM_LIBS)
libi18n_la_SOURCES = \
$(XI18N_DL_SOURCES) \
XDefaultIMIF.c \
XDefaultOMIF.c \
xim_trans.c\
ICWrap.c\
IMWrap.c\
imKStoUCS.c\
lcCT.c\
lcCharSet.c\
lcConv.c\
lcDB.c\
lcDynamic.c\
lcFile.c\
lcGeneric.c\
lcInit.c\
lcPrTxt.c\
lcPubWrap.c\
lcPublic.c\
lcRM.c\
lcStd.c\
lcTxtPr.c\
lcUTF8.c\
lcUtil.c\
lcWrap.c\
mbWMProps.c\
mbWrap.c\
utf8WMProps.c\
utf8Wrap.c\
wcWrap.c\
Xaixlcint.h\
XimImSw.h\
XimProto.h\
XimThai.h\
XimTrInt.h\
XimTrX.h\
XimTrans.h\
Ximint.h\
XimintL.h\
XimintP.h\
XlcGeneric.h\
XlcPubI.h\
XlcPublic.h\
Xlcint.h\
lcUniConv/armscii_8.h\
lcUniConv/ascii.h\
lcUniConv/big5.h\
lcUniConv/big5_emacs.h\
lcUniConv/cp1133.h\
lcUniConv/cp1251.h\
lcUniConv/cp1255.h\
lcUniConv/cp1256.h\
lcUniConv/gb2312.h\
lcUniConv/georgian_academy.h\
lcUniConv/georgian_ps.h\
lcUniConv/iso8859_1.h\
lcUniConv/iso8859_10.h\
lcUniConv/iso8859_11.h\
lcUniConv/iso8859_13.h\
lcUniConv/iso8859_14.h\
lcUniConv/iso8859_15.h\
lcUniConv/iso8859_16.h\
lcUniConv/iso8859_2.h\
lcUniConv/iso8859_3.h\
lcUniConv/iso8859_4.h\
lcUniConv/iso8859_5.h\
lcUniConv/iso8859_6.h\
lcUniConv/iso8859_7.h\
lcUniConv/iso8859_8.h\
lcUniConv/iso8859_9.h\
lcUniConv/iso8859_9e.h\
lcUniConv/jisx0201.h\
lcUniConv/jisx0208.h\
lcUniConv/jisx0212.h\
lcUniConv/koi8_c.h\
lcUniConv/koi8_r.h\
lcUniConv/koi8_u.h\
lcUniConv/ksc5601.h\
lcUniConv/mulelao.h\
lcUniConv/tatar_cyr.h\
lcUniConv/tcvn.h\
lcUniConv/tis620.h\
lcUniConv/ucs2be.h\
lcUniConv/utf8.h\
lcUniConv/viscii.h

0
src/xim_trans.c → src/xlibi18n/xim_trans.c
View file