aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/Imakefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-19 22:15:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-19 22:15:01 +0200
commit70ac75f4ab184c21d11b9840a47362610aaef481 (patch)
tree183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/lib/X11/Imakefile
parent6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff)
parent70e9d346fe34af127d2c827c3678e53d0f4312ae (diff)
downloadnx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz
nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2
nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/lib/X11/Imakefile')
-rw-r--r--nx-X11/lib/X11/Imakefile11
1 files changed, 1 insertions, 10 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 5a1fc5ff2..8549f69cd 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -159,8 +159,7 @@ EXTRA_LIBRARIES = /**/
XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines
EDB_DEFINES = -DERRORDB=\"$(USRDATADIR)/XErrorDB\"
- KDB_DEFINES = -DKEYSYMDB=\"$(USRDATADIR)/XKeysymDB\"
- CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\"
+ CMS_DEFINES = -DXCMSDB=\"$(USRDATADIR)/Xcms.txt\" -DXCMSDIR=\"$(USRDATADIR)\"
#if HasSnprintf
MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11
#endif
@@ -925,10 +924,7 @@ STATICI18NSTATICSRCS = \
imTrX.c \
imTransR.c \
imTrans.c \
- lcEuc.c \
lcGenConv.c \
- lcJis.c \
- lcSjis.c \
lcUTF8Load.c \
omDefault.c \
omGeneric.c \
@@ -999,10 +995,7 @@ STATICI18NSTATICOBJS = \
imTrX.o \
imTransR.o \
imTrans.o \
- lcEuc.o \
lcGenConv.o \
- lcJis.o \
- lcSjis.o \
lcUTF8Load.o \
omDefault.o \
omGeneric.o \
@@ -1063,7 +1056,6 @@ EXTRASHAREDOBJS = $(STATICLCOBJS)
#include <Library.tmpl>
SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
-SpecialCLibObjectRule(StrKeysym,$(ICONFIGFILES),$(KDB_DEFINES))
SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS))
SpecialCLibObjectRule(x11_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
SpecialCLibObjectRule(xim_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
@@ -1100,7 +1092,6 @@ SpecialCLibObjectRuleSeparateOpts(PutImage,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_D
InstallNonExecFile(Xcms.txt,$(LIBDIR))
#endif
InstallNonExecFile(XErrorDB,$(LIBDIR))
-InstallNonExecFile(XKeysymDB,$(LIBDIR))
InstallLintLibrary(X11,$(LINTLIBDIR))
#ifdef QNX4Architecture