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

Move i18n modules to top-level so they can be built in the right order (before xlib for non-loadable, after xlib for loadable).

Browse source 
Link i18n modules against xlib to resolve Xlib symbols used by them.
This commit is contained in:
Keith Packard 2005-07-15 04:08:51 +00:00
parent 45f40126a7
commit 6d84a8b132
10 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
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:

7
Makefile.am
View file

@ -1,4 +1,9 @@
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

20
configure.ac
View file

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

14
src/xlibi18n/Makefile.am
View file

@ -1,5 +1,3 @@
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 = \