Merge branch 'uli42-pr/remove_xlibi18n' into 3.6.x

Attributes GH PR #279: https://github.com/ArcticaProject/nx-libs/pull/279
Fixes ArcticaProject/nx-libs#264.

15 files changed, 0 insertions, 304 deletions

diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 5e3c06611..b3fc07adf 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -93,12 +93,6 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
 
 #endif
 
-#if BuildLoadableXlibI18n
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-#define NoLibSubdirs
-#endif
-
 #define DoNormalLib NormalLibX11
 #define DoSharedLib SharedLibX11
 #define DoExtraLib SharedLibX11
@@ -109,10 +103,6 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
 #define HugeLibrary YES
 #define IncSubdir nx-X11
 
-#if BuildLoadableXlibI18n
-SUBDIRS = xlibi18n
-#endif
-
 /*
  FIXME: This is switchable upstream via configure option, we leave it
  on for now as this is the upstream default.
@@ -129,9 +119,6 @@ XCB_DEFINES = -DUSE_XCB=0
 #ifdef SharedX11Reqs
 REQUIREDX11LIBS = SharedX11Reqs
 #endif
-#if BuildLoadableXlibI18n
-REQUIREDI18NLIBS = DlLibrary
-#endif
 #ifdef cygwinArchitecture
 EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity
 #endif
@@ -224,12 +211,7 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR
            SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */
        LINTLIBS =
 
-#if BuildLoadableXlibI18n && DoSharedLib
-EXTRASHAREDSRC = $(SHAREDLCSRCS)
-#endif
-#if !BuildLoadableXlibI18n || DoNormalLib
 EXTRASTATICSRC = $(STATICLCSRCS)
-#endif
 
 EXTRASRCS = $(EXTRASHAREDSRC) $(EXTRASTATICSRC)
 
@@ -909,10 +891,6 @@ OBJS3 = \
 	xim_trans.o \
 	$(XKBOBJS) $(LCOBJS) $(MISCOBJS)
 
-#if BuildLoadableXlibI18n
-LC_DYNDEFINES = -DUSE_DYNAMIC_LC
-#endif
-
 SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c
 
 SHAREDI18NSTATICSRCS = \
@@ -1070,11 +1048,7 @@ OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
 
 EXTRAUNSHAREDOBJS = $(STATICLCOBJS)
 
-#if BuildLoadableXlibI18n
-EXTRASHAREDOBJS = $(SHAREDLCOBJS)
-# else
 EXTRASHAREDOBJS = $(STATICLCOBJS)
-#endif
 
 #include <Library.tmpl>
 
@@ -1099,11 +1073,6 @@ SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
 SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
 SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
 #endif
-#if BuildLoadableXlibI18n
-SpecialCLibObjectRuleSeparateOpts(lcInit,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES))
-SpecialCLibObjectRuleSeparateOpts(lcGeneric,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES))
-SpecialCLibObjectRuleSeparateOpts(lcPublic,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES))
-#endif
 #if BuildLoadableXlibXcursor
 SpecialCLibObjectRuleSeparateOpts(CrCursor,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
 SpecialCLibObjectRuleSeparateOpts(CrGlCur,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES))
@@ -1155,12 +1124,6 @@ StrKeysym.o: ks_tables.h
 
 DependTarget3($(SRCS1),$(SRCS2),$(SRCS3) $(EXTRASRCS))
 
-#if BuildLoadableXlibI18n
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
-#endif
 #endif
 
 includes:: XlibConf.h pathmax.h
diff --git a/nx-X11/lib/X11/xlibi18n/Imakefile b/nx-X11/lib/X11/xlibi18n/Imakefile
deleted file mode 100644
index 6074f9fd3..000000000
--- a/nx-X11/lib/X11/xlibi18n/Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-SUBDIRS = lc im om
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
diff --git a/nx-X11/lib/X11/xlibi18n/Xi18nLib.conf b/nx-X11/lib/X11/xlibi18n/Xi18nLib.conf
deleted file mode 100644
index d2abd0d1a..000000000
--- a/nx-X11/lib/X11/xlibi18n/Xi18nLib.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#define DoNormalLib NO
-#define DoSharedLib YES
-#define DoDebugLib DebugLibX11
-#define DoProfileLib ProfileLibX11
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-#include <Threads.tmpl>
-
-     SOXI18NREV = 2
-     POSTLOCALE = common
-#if defined (LibDirName)
-     POSTLOCALELIB = LibDirName
-#else
-     POSTLOCALELIB = lib
-#endif
-
-#if Malloc0ReturnsNull
-     MALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-#if NeedLibInsideFlag
-    LIB_DEFINES = -D_XLIBINT_
-#endif
-
-DYNAMIC_DEFINES = -DDYNAMIC_LOAD
-        DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(SUNSOFT_DEFINES)
-
-#include <Library.tmpl>
-
-#if defined(HPArchitecture) && OSMajorVersion > 9
-    EXTRA_SHLIBLDFLAGS = +s +b $(USRLIBDIR)
-#else
-    EXTRA_SHLIBLDFLAGS = 
-#endif
-
-#if defined(SparcArchitecture)
-#if defined(HasSunC) && HasSunC
-CFLAGS += -xregs=no%appl
-#endif
-#if HasGcc
-CFLAGS += -mno-app-regs
-#endif
-#endif
-
-all::
-	$(_NULLCMD_)
-.c.o:
-	$(_NULLCMD_)
-	$(_NULLCMD_)
-	$(_NULLCMD_)
-	$(RM) $@
-	$(CC) -c $(CFLAGS) $(_NOOP_) $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c
-
-clean::
-	rm -rf *.so.$(SOXI18NREV)
-
-lint::
-	$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
-
-#ifndef BuildI18NTop
-# define BuildI18NTop $(BUILDLIBTOP)/../../..
-#endif
-
-BUILDI18NTOP = BuildI18NTop
-
-#ifndef LinkBuildXi18nLibrary
-# ifdef UseInstalled
-#  define LinkBuildXi18nLibrary(libname,rev) 
-# else
-#  define LinkBuildXi18nLibrary(libname,rev)				@@\
-AllTarget(AllTarget(Concat(lib,libname.so.rev)))			@@\
-	MakeDir($(BUILDI18NDIR)/$(POSTLOCALELIB)/$(POSTLOCALE))	@@\
-	RemoveFile($(BUILDI18NDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)/libname.so.$(SOXI18NREV))	@@\
-	cd $(BUILDI18NDIR)/$(POSTLOCALELIB)/$(POSTLOCALE) && $(LN) $(BUILDI18NTOP)/$(CURRENT_DIR)/Concat(lib,libname.so.rev) ./libname.so.rev
-# endif
-#endif
-
-#ifndef Xi18nLibraryTarget
-# if 0 /* !CrossCompiling */
-#  define	Xi18nLibraryTarget(libname)		@@\
-all:: libname.so.$(SOXI18NREV)			@@\
-libname.so.$(SOXI18NREV): $(OBJS)		@@\
-	$(RM) $@~				@@\
-	(cd .; T=`echo $@ | sed 's/\.[^\.]*$$//'`; $(LD) -o ./$@~ $(SHLIBLDFLAGS) $(OBJS) $(REQUIREDLIBS) $(EXTRA_SHLIBLDFLAGS); $(RM) $$T && $(LN) $@ $$T) @@\
-	$(RM) $@				@@\
-	$(MV) $@~ $@				@@\
-install:: libname.so.$(SOXI18NREV)		@@\
-	@if [ -d $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE) ]; then set +x; \ @@\
-	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)); fi @@\
-	$(RM) $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)/libname.so.$(SOXI18NREV)	@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) libname.so.$(SOXI18NREV) $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)
-# else
-#  define Xi18nLibraryTarget(libname)				@@\
-DependTarget()							@@\
-SharedLibraryTarget(libname,$(SOXI18NREV),$(OBJS),.,.)		@@\
-LinkBuildXi18nLibrary(libname,$(SOXI18NREV))			@@\
-install:: Concat(lib,libname.so.$(SOXI18NREV))			@@\
-	MakeDir($(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE))		@@\
-	$(RM) $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)/libname.so.$(SOXI18NREV)	@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.$(SOXI18NREV)) $(DESTDIR)$(XLOCALEDIR)/$(POSTLOCALELIB)/$(POSTLOCALE)/libname.so.$(SOXI18NREV)
-
-# endif
-#endif
diff --git a/nx-X11/lib/X11/xlibi18n/im/Imakefile b/nx-X11/lib/X11/xlibi18n/im/Imakefile
deleted file mode 100644
index 8e0816cb9..000000000
--- a/nx-X11/lib/X11/xlibi18n/im/Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-SUBDIRS = ximcp
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
diff --git a/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile b/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile
deleted file mode 100644
index 881f25f87..000000000
--- a/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "../../Xi18nLib.conf"
-
- EXTRA_INCLUDES = -I../../..
-           SRCS = 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 \
-		  imRm.c imRmAttr.c \
-		  imThaiFlt.c imThaiIc.c imThaiIm.c \
-		  imTrX.c imTransR.c imTrans.c
-           OBJS = ${SRCS:.c=.o}
-
-   CONN_DEFINES = ConnectionFlags
-   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT
-   REQUIREDLIBS = SharedXlibi18nReqs
-
-LinkSourceFile(imCallbk.c, ../../..)
-LinkSourceFile(imDefFlt.c, ../../..)
-LinkSourceFile(imDefIc.c, ../../..)
-LinkSourceFile(imDefIm.c, ../../..)
-LinkSourceFile(imDefLkup.c, ../../..)
-LinkSourceFile(imDispch.c, ../../..)
-LinkSourceFile(imEvToWire.c, ../../..)
-LinkSourceFile(imExten.c, ../../..)
-LinkSourceFile(imImSw.c, ../../..)
-LinkSourceFile(imInsClbk.c, ../../..)
-LinkSourceFile(imInt.c, ../../..)
-LinkSourceFile(imLcFlt.c, ../../..)
-LinkSourceFile(imLcGIc.c, ../../..)
-LinkSourceFile(imLcIc.c, ../../..)
-LinkSourceFile(imLcIm.c, ../../..)
-LinkSourceFile(imLcLkup.c, ../../..)
-LinkSourceFile(imLcPrs.c, ../../..)
-LinkSourceFile(imLcSIc.c, ../../..)
-LinkSourceFile(imThaiFlt.c, ../../..)
-LinkSourceFile(imThaiIc.c, ../../..)
-LinkSourceFile(imThaiIm.c, ../../..)
-LinkSourceFile(imRm.c, ../../..)
-LinkSourceFile(imRmAttr.c, ../../..)
-LinkSourceFile(imTrX.c, ../../..)
-LinkSourceFile(imTransR.c, ../../..)
-LinkSourceFile(imTrans.c, ../../..)
-
-SpecialCLibObjectRule(imTransR,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(imTrans,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-#if BuildXKBlib
-SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
-#endif
-
-Xi18nLibraryTarget(ximcp)
diff --git a/nx-X11/lib/X11/xlibi18n/im/ximcp/Ximcp.mapfile b/nx-X11/lib/X11/xlibi18n/im/ximcp/Ximcp.mapfile
deleted file mode 100644
index ab2f1a30f..000000000
--- a/nx-X11/lib/X11/xlibi18n/im/ximcp/Ximcp.mapfile
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	local:
-		*;
-	global:
-		_XimOpenIM;
-};
diff --git a/nx-X11/lib/X11/xlibi18n/lc/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/Imakefile
deleted file mode 100644
index d3beed642..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-SUBDIRS = gen def Utf8
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
diff --git a/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile
deleted file mode 100644
index 416151fda..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "../../Xi18nLib.conf"
-
- EXTRA_INCLUDES = -I../../..
-      XI18NLIBNAME = xlibi18n
-           SRCS = lcUTF8Load.c
-           OBJS = ${SRCS:.c=.o}
-   REQUIREDLIBS = SharedXlibi18nReqs
-
-LinkSourceFile(lcUTF8Load.c, ../../..)
-
-Xi18nLibraryTarget(xlcUTF8Load)
diff --git a/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile
deleted file mode 100644
index 1ef2d85c7..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "../../Xi18nLib.conf"
-
- EXTRA_INCLUDES = -I../../..
-      XI18NLIBNAME = xlcDef
-           SRCS = lcDefConv.c
-           OBJS = ${SRCS:.c=.o}
-   REQUIREDLIBS = SharedXlibi18nReqs
-
-LinkSourceFile(lcDefConv.c, ../../..)
-
-Xi18nLibraryTarget(xlcDef)
diff --git a/nx-X11/lib/X11/xlibi18n/lc/def/Xlc.mapfile b/nx-X11/lib/X11/xlibi18n/lc/def/Xlc.mapfile
deleted file mode 100644
index ce4fc69bd..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/def/Xlc.mapfile
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	local:
-		*;
-	global:
-		_XlcDefaultLoader;
-};
diff --git a/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile
deleted file mode 100644
index 886832805..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "../../Xi18nLib.conf"
-
- EXTRA_INCLUDES = -I../../..
-      XI18NLIBNAME = xlibi18n
-           SRCS = lcGenConv.c
-           OBJS = ${SRCS:.c=.o}
-   REQUIREDLIBS = SharedXlibi18nReqs
-
-LinkSourceFile(lcGenConv.c, ../../..)
-
-Xi18nLibraryTarget(xlibi18n)
diff --git a/nx-X11/lib/X11/xlibi18n/lc/gen/Xlc.mapfile b/nx-X11/lib/X11/xlibi18n/lc/gen/Xlc.mapfile
deleted file mode 100644
index cd6ba7569..000000000
--- a/nx-X11/lib/X11/xlibi18n/lc/gen/Xlc.mapfile
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	local:
-		*;
-	global:
-		_XlcGenericLoader;
-};
diff --git a/nx-X11/lib/X11/xlibi18n/om/Imakefile b/nx-X11/lib/X11/xlibi18n/om/Imakefile
deleted file mode 100644
index e02f7624e..000000000
--- a/nx-X11/lib/X11/xlibi18n/om/Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-SUBDIRS = generic
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
diff --git a/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile b/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile
deleted file mode 100644
index d95882706..000000000
--- a/nx-X11/lib/X11/xlibi18n/om/generic/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#include "../../Xi18nLib.conf"
-
- EXTRA_INCLUDES = -I../../..
-           SRCS = omDefault.c omGeneric.c omImText.c omText.c \
-		  omTextEsc.c omTextExt.c omTextPer.c omXChar.c
-
-           OBJS = ${SRCS:.c=.o}
-   REQUIREDLIBS = SharedXlibi18nReqs
-
-LinkSourceFile(omDefault.c, ../../..)
-LinkSourceFile(omGeneric.c, ../../..)
-LinkSourceFile(omImText.c, ../../..)
-LinkSourceFile(omText.c, ../../..)
-LinkSourceFile(omTextEsc.c, ../../..)
-LinkSourceFile(omTextExt.c, ../../..)
-LinkSourceFile(omTextPer.c, ../../..)
-LinkSourceFile(omXChar.c, ../../..)
-
-Xi18nLibraryTarget(xomGeneric)
diff --git a/nx-X11/lib/X11/xlibi18n/om/generic/Xom.mapfile b/nx-X11/lib/X11/xlibi18n/om/generic/Xom.mapfile
deleted file mode 100644
index 8b710460f..000000000
--- a/nx-X11/lib/X11/xlibi18n/om/generic/Xom.mapfile
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	local:
-		*;
-	global:
-		_XomGenericOpenOM;
-};