Commit 6d84a8b1 authored by Keith Packard's avatar Keith Packard

Move i18n modules to top-level so they can be built in the right order (before...

Move i18n modules to top-level so they can be built in the right order (before xlib for non-loadable, after xlib for loadable).
Link i18n modules against xlib to resolve Xlib symbols used by them.
parent 45f40126
2005-07-14 Keith Packard <keithp@keithp.com>
* Makefile.am:
* configure.ac:
* modules/im/ximcp/Makefile.am:
* modules/lc/Utf8/Makefile.am:
* modules/lc/def/Makefile.am:
* modules/lc/gen/Makefile.am:
* modules/lc/xlocale/Makefile.am:
* modules/om/generic/Makefile.am:
* src/xlibi18n/Makefile.am:
Move i18n modules to top-level so they can be
built in the right order (before xlib for non-loadable,
after xlib for loadable).
Link i18n modules against xlib to resolve Xlib symbols
used by them.
2005-07-11 Keith Packard <keithp@keithp.com>
* src/xcms/Makefile.am:
......
SUBDIRS=include src nls man
if XLIB_LOADABLE_I18N
ORDER=src modules
else
ORDER=modules src
endif
SUBDIRS=include $(ORDER) nls man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = x11.pc
......
......@@ -73,6 +73,7 @@ AC_ARG_ENABLE(loadable-i18n,
if test x$XLIB_LOADABLE_I18N = xyes; then
AC_DEFINE(USE_DYNAMIC_LC,1,
[Split some i18n functions into loadable modules])
AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')
fi
AC_MSG_RESULT($XLIB_LOADABLE_I18N)
......@@ -290,15 +291,16 @@ AC_OUTPUT([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
modules/Makefile
modules/im/Makefile
modules/im/ximcp/Makefile
modules/lc/Makefile
modules/lc/def/Makefile
modules/lc/gen/Makefile
modules/lc/Utf8/Makefile
modules/lc/xlocale/Makefile
modules/om/Makefile
modules/om/generic/Makefile
src/xkb/Makefile
nls/Makefile
nls/armscii-8/Makefile
......
......@@ -17,6 +17,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=ximcp.la
ximcp_la_LDFLAGS = -module -version-number 2:0:0
ximcp_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
......@@ -17,6 +17,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlcUTF8Load.la
xlcUTF8Load_la_LDFLAGS = -module -version-number 2:0:0
xlcUTF8Load_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
......@@ -17,6 +17,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlcDef.la
xlcDef_la_LDFLAGS = -module -version-number 2:0:0
xlcDef_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
......@@ -17,6 +17,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlibi18n.la
xlibi18n_la_LDFLAGS = -module -version-number 2:0:0
xlibi18n_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
......@@ -17,6 +17,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xlocale.la
xlocale_la_LDFLAGS = -module -version-number 2:0:0
xlocale_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
......@@ -18,6 +18,7 @@ if XLIB_LOADABLE_I18N
commonlibdir = $(X11_LOCALELIBDIR)/common
commonlib_LTLIBRARIES=xomGeneric.la
xomGeneric_la_LDFLAGS = -module -version-number 2:0:0
xomGeneric_la_LIBADD = $(I18N_MODULE_LIBS)
else
......
SUBDIRS=im lc om
AM_CFLAGS= \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/X11 \
......@@ -30,16 +28,16 @@ else
# Static interfaces to input/output methods
#
IM_LIBS = \
im/ximcp/libximcp.la
${top_builddir}/modules/im/ximcp/libximcp.la
LC_LIBS = \
lc/def/libxlcDef.la \
lc/gen/libxlibi18n.la \
lc/Utf8/libxlcUTF8Load.la \
lc/xlocale/libxlocale.la
${top_builddir}/modules/lc/def/libxlcDef.la \
${top_builddir}/modules/lc/gen/libxlibi18n.la \
${top_builddir}/modules/lc/Utf8/libxlcUTF8Load.la \
${top_builddir}/modules/lc/xlocale/libxlocale.la
OM_LIBS = \
om/generic/libxomGeneric.la
${top_builddir}/modules/om/generic/libxomGeneric.la
endif
libi18n_la_LIBADD = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment