diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-04 11:09:37 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-03 13:45:25 +0100 |
commit | 09cf1bcc0cc5f8b9d33b25e46320a9725742a38e (patch) | |
tree | a8f601a2eebcfc5f3fada4a5bcf160179be1c372 /nx-X11/lib/X11/Imakefile | |
parent | ba27cae6369308fd3498c476bbfc3f1c554f8017 (diff) | |
download | nx-libs-09cf1bcc0cc5f8b9d33b25e46320a9725742a38e.tar.gz nx-libs-09cf1bcc0cc5f8b9d33b25e46320a9725742a38e.tar.bz2 nx-libs-09cf1bcc0cc5f8b9d33b25e46320a9725742a38e.zip |
libNX_X11: Fully drop loadable i18n module support in libNX_X11.
- Support for i18n in libNX_X11 is static only, has ever been.
- Thus, the files XlcSL.[co], XlcDL.[co], XDefaultIMIF.[co],
XDefaultOMIF.[co] and lcDynamic.[co] become obsolete.
Diffstat (limited to 'nx-X11/lib/X11/Imakefile')
-rw-r--r-- | nx-X11/lib/X11/Imakefile | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 061f2e33e..055cbec33 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -209,11 +209,11 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */ + OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(EXTRAOBJS) LINTLIBS = -EXTRASTATICSRC = $(STATICLCSRCS) - -EXTRASRCS = $(EXTRASHAREDSRC) $(EXTRASTATICSRC) +EXTRASRCS = $(STATICLCSRCS) +EXTRAOBJS = $(STATICLCOBJS) SRCS1 = \ Context.c \ @@ -891,13 +891,6 @@ OBJS3 = \ xim_trans.o \ $(XKBOBJS) $(LCOBJS) -SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c - -SHAREDI18NSTATICSRCS = \ - XDefaultIMIF.c XDefaultOMIF.c - -STATICLCDEPSYMSRCS = - STATICI18NSTATICSRCS = \ imCallbk.c \ imDefFlt.c \ @@ -958,17 +951,8 @@ LCSRCS = \ lcUTF8.c STATICLCSRCS = \ - $(STATICLCDEPSYMSRCS) \ $(STATICI18NSTATICSRCS) -SHAREDLCSRCS = \ - $(SHAREDLCDEPSYMSRCS) \ - $(SHAREDI18NSTATICSRCS) - -SHAREDLCDEPOBJS = XlcDL.o XlcSL.o -SHAREDI18NSTATICOBJS = \ - XDefaultIMIF.o XDefaultOMIF.o -STATICLCDEPOBJS = STATICI18NSTATICOBJS = \ imCallbk.o \ imDefFlt.o \ @@ -1029,19 +1013,8 @@ LCOBJS = \ lcUTF8.o STATICLCOBJS = \ - $(STATICLCDEPOBJS) \ $(STATICI18NSTATICOBJS) -SHAREDLCOBJS = \ - $(SHAREDLCDEPOBJS) \ - $(SHAREDI18NSTATICOBJS) - -OBJS = $(OBJS1) $(OBJS2) $(OBJS3) - -EXTRAUNSHAREDOBJS = $(STATICLCOBJS) - -EXTRASHAREDOBJS = $(STATICLCOBJS) - #include <Library.tmpl> SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES)) |