From 6d84a8b1329af1fcfe86b198f1a6e7dd6ff616c3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 15 Jul 2005 04:08:51 +0000 Subject: [PATCH] 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. --- ChangeLog | 17 +++++++++++++++++ Makefile.am | 7 ++++++- configure.ac | 20 +++++++++++--------- modules/im/ximcp/Makefile.am | 1 + modules/lc/Utf8/Makefile.am | 1 + modules/lc/def/Makefile.am | 1 + modules/lc/gen/Makefile.am | 1 + modules/lc/xlocale/Makefile.am | 1 + modules/om/generic/Makefile.am | 1 + src/xlibi18n/Makefile.am | 14 ++++++-------- 10 files changed, 46 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 180f6f3a..327ac5a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2005-07-14 Keith Packard + + * 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 * src/xcms/Makefile.am: diff --git a/Makefile.am b/Makefile.am index e892e621..09cabc2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 1485744f..cfcb5336 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/modules/im/ximcp/Makefile.am b/modules/im/ximcp/Makefile.am index 46c0f6bc..51ada415 100644 --- a/modules/im/ximcp/Makefile.am +++ b/modules/im/ximcp/Makefile.am @@ -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 diff --git a/modules/lc/Utf8/Makefile.am b/modules/lc/Utf8/Makefile.am index c58fe111..4a7296e3 100644 --- a/modules/lc/Utf8/Makefile.am +++ b/modules/lc/Utf8/Makefile.am @@ -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 diff --git a/modules/lc/def/Makefile.am b/modules/lc/def/Makefile.am index 3e6db7ee..f417b875 100644 --- a/modules/lc/def/Makefile.am +++ b/modules/lc/def/Makefile.am @@ -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 diff --git a/modules/lc/gen/Makefile.am b/modules/lc/gen/Makefile.am index 3e9dc12f..cce0cd65 100644 --- a/modules/lc/gen/Makefile.am +++ b/modules/lc/gen/Makefile.am @@ -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 diff --git a/modules/lc/xlocale/Makefile.am b/modules/lc/xlocale/Makefile.am index 546b6080..b675a0f6 100644 --- a/modules/lc/xlocale/Makefile.am +++ b/modules/lc/xlocale/Makefile.am @@ -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 diff --git a/modules/om/generic/Makefile.am b/modules/om/generic/Makefile.am index 13af660d..ea5e77de 100644 --- a/modules/om/generic/Makefile.am +++ b/modules/om/generic/Makefile.am @@ -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 diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am index 6ee85e6f..5d860a95 100644 --- a/src/xlibi18n/Makefile.am +++ b/src/xlibi18n/Makefile.am @@ -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 = \